Skip to content

Commit a929761

Browse files
KentzoAllen Winter
authored and
Allen Winter
committedJan 17, 2024
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.
1 parent aec14ba commit a929761

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

‎GammaRayConfig.cmake.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
@PACKAGE_INIT@
1111

12-
find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE REQUIRED COMPONENTS Core Network)
13-
find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE COMPONENTS Widgets)
14-
1512
set_and_check(GammaRay_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
1613
list(APPEND GammaRay_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@/..")
1714

15+
find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE REQUIRED COMPONENTS Core Network)
16+
find_package(Qt@QtCore_VERSION_MAJOR@ @QtCore_VERSION_MAJOR@.@QtCore_VERSION_MINOR@ NO_MODULE COMPONENTS Widgets)
17+
1818
set(GAMMARAY_PLUGIN_INSTALL_DIR @PLUGIN_INSTALL_DIR@)
1919
set(GAMMARAY_PLUGIN_VERSION @GAMMARAY_PLUGIN_VERSION@)
2020
set(GAMMARAY_PROBE_ABI @GAMMARAY_PROBE_ABI@)

0 commit comments

Comments
 (0)
Please sign in to comment.