CMake: Fix invalidation of PACKAGE_INCLUDE_INSTALL_DIR

CMake uses the PACKAGE_PREFIX_DIR variable which may be overwritten by the find_package calls. The issue manifests when cross-compiling where Qt with tools differs from Qt with libraries.
KDAB · Jan 17, 2024 · a929761 · a929761
1 parent aec14ba
commit a929761
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/GammaRayConfig.cmake.in b/GammaRayConfig.cmake.in
@@ -9,12 +9,12 @@
 
 @PACKAGE_INIT@
 
-find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE REQUIRED COMPONENTS Core Network)
-find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE COMPONENTS Widgets)
-
 set_and_check(GammaRay_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
 list(APPEND GammaRay_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@/..")
 
+find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE REQUIRED COMPONENTS Core Network)
+find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE COMPONENTS Widgets)
+
 set(GAMMARAY_PLUGIN_INSTALL_DIR @PLUGIN_INSTALL_DIR@)
 set(GAMMARAY_PLUGIN_VERSION @GAMMARAY_PLUGIN_VERSION@)
 set(GAMMARAY_PROBE_ABI @GAMMARAY_PROBE_ABI@)