diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-01-12 20:49:37 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2023-01-14 22:09:52 +0100 |
| commit | 5685962e60273b80b3b47735d86d665b518b5066 (patch) | |
| tree | 2edea1bf7e372c6ee7472ecdb4f107b589366aaa /tests | |
| parent | b62b9a37b752e153385b3dc9460c4b010b6d3a1a (diff) | |
| download | qtapplicationmanager-5685962e60273b80b3b47735d86d665b518b5066.tar.gz | |
cmake: do not find_package the packager tool when building the AM
Also fixed a minor cmake warning while at it.
Pick-to: 6.5
Change-Id: Iad3f48df689d6e80e1381443639aeb9f0e27a0e2
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/data/CMakeLists.txt b/tests/data/CMakeLists.txt index 771e09c5..6f8be60c 100644 --- a/tests/data/CMakeLists.txt +++ b/tests/data/CMakeLists.txt @@ -44,14 +44,18 @@ if (WIN32) # /mingw64/bin to $PATH, which in most cases has incompatible versions of the stdc++ and # gcc libs, preventing the appman-packager from starting. - find_package(Qt6 COMPONENTS AppManMainPrivateTools) + if (NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::appman-packager) + find_package(Qt6 COMPONENTS AppManMainPrivateTools) + endif() add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packages COMMAND ${bash} -c 'export PATH="`cygpath -u -p \"${env_path}\"`:$$PATH" \; ${CMAKE_CURRENT_BINARY_DIR}/create-test-packages.sh $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::appman-packager>' DEPENDS ${ALL_TEST_DATA_FILES} ) endif() else() - find_package(Qt6 COMPONENTS AppManMainPrivateTools) + if (NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::appman-packager) + find_package(Qt6 COMPONENTS AppManMainPrivateTools) + endif() add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packages COMMAND "${CMAKE_COMMAND}" -E env "PATH=${env_path}${QT_PATH_SEPARATOR}$ENV{PATH}" ${CMAKE_CURRENT_BINARY_DIR}/create-test-packages.sh $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::appman-packager> |