From b343fb40d72869a15a097f7d7a6469ac73a32f8a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 4 Jun 2020 18:36:54 +0200 Subject: CMake: Fix duplicate "gallery" target name This fixes top-level builds that include qtquickcontrols2 to configure successfully. Change-Id: Ia90669ac66c65fc20e16ecbf15507f17a19053d8 Reviewed-by: Cristian Adam --- .../quickcontrols2/gallery/.prev_CMakeLists.txt | 103 +++++++++++++++++++++ examples/quickcontrols2/gallery/CMakeLists.txt | 10 +- 2 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 examples/quickcontrols2/gallery/.prev_CMakeLists.txt (limited to 'examples') diff --git a/examples/quickcontrols2/gallery/.prev_CMakeLists.txt b/examples/quickcontrols2/gallery/.prev_CMakeLists.txt new file mode 100644 index 00000000..a175afa9 --- /dev/null +++ b/examples/quickcontrols2/gallery/.prev_CMakeLists.txt @@ -0,0 +1,103 @@ +# Generated from gallery.pro. + +cmake_minimum_required(VERSION 3.14) +project(gallery LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/gallery") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS QuickControls2) + +add_qt_gui_executable(gallery + gallery.cpp +) +target_link_libraries(gallery PUBLIC + Qt::Core + Qt::Gui + Qt::Quick + Qt::QuickControls2 +) + + +# Resources: +set(qmake_immediate_resource_files + "gallery.qml" + "icons/gallery/20x20/back.png" + "icons/gallery/20x20/drawer.png" + "icons/gallery/20x20/menu.png" + "icons/gallery/20x20@2/back.png" + "icons/gallery/20x20@2/drawer.png" + "icons/gallery/20x20@2/menu.png" + "icons/gallery/20x20@3/back.png" + "icons/gallery/20x20@3/drawer.png" + "icons/gallery/20x20@3/menu.png" + "icons/gallery/20x20@4/back.png" + "icons/gallery/20x20@4/drawer.png" + "icons/gallery/20x20@4/menu.png" + "icons/gallery/index.theme" + "images/arrow.png" + "images/arrow@2x.png" + "images/arrow@3x.png" + "images/arrow@4x.png" + "images/arrows.png" + "images/arrows@2x.png" + "images/arrows@3x.png" + "images/arrows@4x.png" + "images/qt-logo.png" + "images/qt-logo@2x.png" + "images/qt-logo@3x.png" + "images/qt-logo@4x.png" + "pages/BusyIndicatorPage.qml" + "pages/ButtonPage.qml" + "pages/CheckBoxPage.qml" + "pages/ComboBoxPage.qml" + "pages/DelayButtonPage.qml" + "pages/DelegatePage.qml" + "pages/DialPage.qml" + "pages/DialogPage.qml" + "pages/FramePage.qml" + "pages/GroupBoxPage.qml" + "pages/PageIndicatorPage.qml" + "pages/ProgressBarPage.qml" + "pages/RadioButtonPage.qml" + "pages/RangeSliderPage.qml" + "pages/ScrollBarPage.qml" + "pages/ScrollIndicatorPage.qml" + "pages/ScrollablePage.qml" + "pages/SliderPage.qml" + "pages/SpinBoxPage.qml" + "pages/StackViewPage.qml" + "pages/SwipeViewPage.qml" + "pages/SwitchPage.qml" + "pages/TabBarPage.qml" + "pages/TextAreaPage.qml" + "pages/TextFieldPage.qml" + "pages/ToolTipPage.qml" + "pages/TumblerPage.qml" + "qtquickcontrols2.conf" +) + +qt6_add_resources(gallery "qmake_immediate" + PREFIX + "/" + FILES + ${qmake_immediate_resource_files} +) + +install(TARGETS gallery + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/quickcontrols2/gallery/CMakeLists.txt b/examples/quickcontrols2/gallery/CMakeLists.txt index a175afa9..d4c9df04 100644 --- a/examples/quickcontrols2/gallery/CMakeLists.txt +++ b/examples/quickcontrols2/gallery/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from gallery.pro. cmake_minimum_required(VERSION 3.14) -project(gallery LANGUAGES CXX) +project(gallery_controls2 LANGUAGES CXX) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -20,10 +20,10 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Quick) find_package(Qt6 COMPONENTS QuickControls2) -add_qt_gui_executable(gallery +add_qt_gui_executable(gallery_controls2 # special case gallery.cpp ) -target_link_libraries(gallery PUBLIC +target_link_libraries(gallery_controls2 PUBLIC # special case Qt::Core Qt::Gui Qt::Quick @@ -89,14 +89,14 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt6_add_resources(gallery "qmake_immediate" +qt6_add_resources(gallery_controls2 "qmake_immediate" # special case PREFIX "/" FILES ${qmake_immediate_resource_files} ) -install(TARGETS gallery +install(TARGETS gallery_controls2 # special case RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3