From ad9b7833b0cd9b2bd728712a30684b692cb065c0 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@qt.io>
Date: Thu, 12 Jan 2023 20:49:37 +0100
Subject: cmake: do not find_package the packager tool when building the AM

Also fixed a minor cmake warning while at it.

Change-Id: Iad3f48df689d6e80e1381443639aeb9f0e27a0e2
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 5685962e60273b80b3b47735d86d665b518b5066)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/tools/launcher-qml/CMakeLists.txt | 2 +-
 src/tools/packager/CMakeLists.txt     | 1 +
 tests/data/CMakeLists.txt             | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/tools/launcher-qml/CMakeLists.txt b/src/tools/launcher-qml/CMakeLists.txt
index eb7567be..d2645d30 100644
--- a/src/tools/launcher-qml/CMakeLists.txt
+++ b/src/tools/launcher-qml/CMakeLists.txt
@@ -3,7 +3,7 @@ qt_internal_add_app(appman-launcher-qml
     EXCEPTIONS
     SOURCES
         launcher-qml.cpp launcher-qml_p.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::DBus
         Qt::Gui
diff --git a/src/tools/packager/CMakeLists.txt b/src/tools/packager/CMakeLists.txt
index cbf85559..407ce3e2 100644
--- a/src/tools/packager/CMakeLists.txt
+++ b/src/tools/packager/CMakeLists.txt
@@ -16,3 +16,4 @@ qt_internal_add_tool(${target_name}
     DEFINES
         AM_COMPILING_APPMAN
 )
+qt_internal_return_unless_building_tools()
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>
-- 
cgit v1.2.1