From 76108058796bf0884f6fd128d81f1bc49f9a56af Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Feb 2020 08:15:50 +0100 Subject: Regenerate examples Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- .../draganddrop/puzzle/.prev_CMakeLists.txt | 47 ++++++++++++++++++++++ examples/widgets/draganddrop/puzzle/CMakeLists.txt | 22 ++++++++-- 2 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt (limited to 'examples/widgets/draganddrop/puzzle') diff --git a/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt b/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt new file mode 100644 index 0000000000..148f386115 --- /dev/null +++ b/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from puzzle.pro. + +cmake_minimum_required(VERSION 3.14) +project(puzzle LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/puzzle") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_qt_gui_executable(puzzle + main.cpp + mainwindow.cpp mainwindow.h + pieceslist.cpp pieceslist.h + puzzlewidget.cpp puzzlewidget.h +) +target_link_libraries(puzzle PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets +) + + +# Resources: +set(puzzle_resource_files + "example.jpg" +) + +qt6_add_resources(puzzle "puzzle" + PREFIX + "/images" + FILES + ${puzzle_resource_files} +) + +install(TARGETS puzzle + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index 99db9b4e0d..b181efd090 100644 --- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt +++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt @@ -9,21 +9,37 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/draganddrop_puzzle") # special case +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(draganddrop_puzzle # special case: renamed puzzle main.cpp mainwindow.cpp mainwindow.h pieceslist.cpp pieceslist.h - puzzle.qrc puzzlewidget.cpp puzzlewidget.h ) -target_link_libraries(draganddrop_puzzle PUBLIC # special case: renamed puzzle +target_link_libraries(draganddrop_puzzle PUBLIC # special case + Qt::Core + Qt::Gui Qt::Widgets ) + +# Resources: +set(puzzle_resource_files + "example.jpg" +) + +qt6_add_resources(draganddrop_puzzle "puzzle" # special case + PREFIX + "/images" + FILES + ${puzzle_resource_files} +) + install(TARGETS draganddrop_puzzle # special case: renamed puzzle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3