diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-01-21 16:14:58 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-02-15 17:31:17 +0100 |
commit | 97c866c75f5d60a79d799279f315d744fbcc2174 (patch) | |
tree | 300b69bdf0c496cd0feb95aa96d7e3bfc7482708 /examples/qt3d/simple-cpp | |
parent | 363d8dc60d7e08eb6a84ea47d08a1cb454c13db8 (diff) |
Improve examples CMakeLists.txt
- Remove # generated from xyz.pro comment from pro2cmake
- Remove "# special case" markers for pro2cmake
- Remove automatic use of CMAKE_AUTORCC
- Only opt into CMAKE_AUTOUIC if .ui files are involved
- Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR
- Combine multiple find_package(Qt6 ... calls)
- use REQUIRED COMPONENTS
- sort components alphabetically
- Fix wrong indentations
- Use (only) one empty line after multi-line commands
Pick-to: 6.3
Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/simple-cpp')
-rw-r--r-- | examples/qt3d/simple-cpp/CMakeLists.txt | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/examples/qt3d/simple-cpp/CMakeLists.txt b/examples/qt3d/simple-cpp/CMakeLists.txt index c59739d03..6068ee161 100644 --- a/examples/qt3d/simple-cpp/CMakeLists.txt +++ b/examples/qt3d/simple-cpp/CMakeLists.txt @@ -1,35 +1,26 @@ -# Generated from simple-cpp.pro. - cmake_minimum_required(VERSION 3.16) project(simple-cpp 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") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS 3DCore) -find_package(Qt6 COMPONENTS 3DRender) -find_package(Qt6 COMPONENTS 3DInput) -find_package(Qt6 COMPONENTS 3DExtras) +find_package(Qt6 REQUIRED COMPONENTS 3DCore 3DExtras 3DInput 3DRender Core Gui) qt_add_executable(simple-cpp main.cpp orbittransformcontroller.cpp orbittransformcontroller.h ) + set_target_properties(simple-cpp PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(simple-cpp PUBLIC Qt::3DCore Qt::3DExtras |