From c4be23758f05719584f2bc4c676fda81c57a9d63 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 16 Oct 2020 16:10:16 +0200 Subject: CMake: Regenerate qt3d examples Many of the examples were missing find_package() calls. Some were missing some example install dir things. Some missing special cases. Some incorrectly specified library names due to missing mappings in pro2cmake. Some incorrectly specified target names. Change-Id: I131a02dc679502ea6c1cdeb32962e77f09e672af Reviewed-by: Mike Krus --- examples/qt3d/controls/.prev_CMakeLists.txt | 52 +++++++++++++++++++++++++++++ examples/qt3d/controls/CMakeLists.txt | 3 ++ 2 files changed, 55 insertions(+) create mode 100644 examples/qt3d/controls/.prev_CMakeLists.txt (limited to 'examples/qt3d/controls') diff --git a/examples/qt3d/controls/.prev_CMakeLists.txt b/examples/qt3d/controls/.prev_CMakeLists.txt new file mode 100644 index 000000000..0f40a4fbc --- /dev/null +++ b/examples/qt3d/controls/.prev_CMakeLists.txt @@ -0,0 +1,52 @@ +# Generated from controls.pro. + +cmake_minimum_required(VERSION 3.14) +project(controls 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}") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Quick) + +add_qt_gui_executable(controls + main.cpp +) +target_link_libraries(controls PUBLIC + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + + +# Resources: +set(controls_resource_files + "Logo.qml" + "Qt_logo.obj" + "main.qml" +) + +qt6_add_resources(controls "controls" + PREFIX + "/" + FILES + ${controls_resource_files} +) + +install(TARGETS controls + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/qt3d/controls/CMakeLists.txt b/examples/qt3d/controls/CMakeLists.txt index 962d62813..61c7b0e8f 100644 --- a/examples/qt3d/controls/CMakeLists.txt +++ b/examples/qt3d/controls/CMakeLists.txt @@ -44,7 +44,10 @@ qt6_add_resources(controls "controls" FILES ${controls_resource_files} ) + +# special case begin target_sources(controls PRIVATE ${controls_resources_files}) # just to show qml files in creator +# special case end install(TARGETS controls RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3