diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-04-26 11:42:47 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-04-29 14:05:01 +0200 |
| commit | 7d7798eb6f61cffe4e5aeb8428892cb5ba616cd9 (patch) | |
| tree | f9c4dd54a6353dfe15780459f3f0c898c308bfde /tests | |
| parent | 1635ca51f018bbb8d1ea5069a7f2ed8503be8cb9 (diff) | |
windowembedding: Update project to use deployment script
Change-Id: I5308fef4b50c5971f65fc6087dadde8c05f5a685
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/windowembedding/CMakeLists.txt | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/manual/windowembedding/CMakeLists.txt b/tests/manual/windowembedding/CMakeLists.txt index f93283d68f..6ad5167186 100644 --- a/tests/manual/windowembedding/CMakeLists.txt +++ b/tests/manual/windowembedding/CMakeLists.txt @@ -4,12 +4,6 @@ cmake_minimum_required(VERSION 3.16) project(windowembedding LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/windowembedding") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Widgets) find_package(Qt6 QUIET OPTIONAL_COMPONENTS Multimedia) @@ -77,9 +71,16 @@ if(APPLE) endif() install(TARGETS windowembedding - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -bundle_shared(windowembedding) +qt_generate_deploy_qml_app_script( + TARGET windowembedding + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM +) +install(SCRIPT ${deploy_script}) |