diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-12-08 16:42:09 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2021-12-13 14:16:26 +0000 |
| commit | 51f22a3a0495d8418a5d6dd0f09771c0347441b9 (patch) | |
| tree | 34b5c133cd5e808e98c63b1e801400b716e34d9d /examples/gui | |
| parent | 9ca7429dff4b5d46114ca36147f65b61d5e61290 (diff) | |
Examples: Remove remaining conversion markers in CMakeLists.txt
Pick-to: 6.3
Change-Id: Ia5d474a3efd6aadbd0ef1537318f2f24e6c24fee
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/gui')
| -rw-r--r-- | examples/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/gui/analogclock/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | examples/gui/rasterwindow/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 15 deletions
diff --git a/examples/gui/CMakeLists.txt b/examples/gui/CMakeLists.txt index d952899f55..0abfb9ba86 100644 --- a/examples/gui/CMakeLists.txt +++ b/examples/gui/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from gui.pro. - if(NOT TARGET Qt::Gui) return() endif() diff --git a/examples/gui/analogclock/CMakeLists.txt b/examples/gui/analogclock/CMakeLists.txt index 4c694e425e..0cd882a722 100644 --- a/examples/gui/analogclock/CMakeLists.txt +++ b/examples/gui/analogclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from analogclock.pro. - cmake_minimum_required(VERSION 3.16) project(analogclock LANGUAGES CXX) @@ -14,33 +12,31 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/gui/gui_analogclock") # special case +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/gui/gui_analogclock") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) -qt_add_executable(gui_analogclock # special case: renamed target +qt_add_executable(gui_analogclock ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h main.cpp ) -set_target_properties(gui_analogclock PROPERTIES # special case +set_target_properties(gui_analogclock PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_include_directories(gui_analogclock PUBLIC # special case +target_include_directories(gui_analogclock PUBLIC ../rasterwindow ) -# special case begin -target_link_libraries(gui_analogclock PUBLIC # special case +target_link_libraries(gui_analogclock PUBLIC Qt::Gui ) -# special case end -target_link_libraries(gui_analogclock PUBLIC # special case +target_link_libraries(gui_analogclock PUBLIC Qt::Core Qt::Gui ) -install(TARGETS gui_analogclock # special case +install(TARGETS gui_analogclock RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/gui/rasterwindow/CMakeLists.txt b/examples/gui/rasterwindow/CMakeLists.txt index 6f41e43e8a..8d3efdd9c9 100644 --- a/examples/gui/rasterwindow/CMakeLists.txt +++ b/examples/gui/rasterwindow/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from rasterwindow.pro. - cmake_minimum_required(VERSION 3.16) project(rasterwindow LANGUAGES CXX) |