Created
November 11, 2020 12:36
-
-
Save torarnv/2eb5b9fe78d26c6ec0ac7474a7f781fa to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git c/cmake/QtModuleHelpers.cmake i/cmake/QtModuleHelpers.cmake | |
index a628ac923d1..aab9a8a2a94 100644 | |
--- c/cmake/QtModuleHelpers.cmake | |
+++ i/cmake/QtModuleHelpers.cmake | |
@@ -199,6 +199,10 @@ function(qt_internal_add_module target) | |
set_property(TARGET "${target}" PROPERTY MODULE_HEADER "${module_include_dir}/${module_include_name}") | |
endif() | |
+ set_target_properties(${target} PROPERTIES | |
+ _qt_public_header_destination "PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module_include_name}" | |
+ _qt_private_header_destination "PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module_include_name}/${PROJECT_VERSION}/${module}/private") | |
+ | |
if(module_headers_qpa) | |
if(is_framework) | |
qt_copy_framework_headers(${target} QPA "${module_headers_qpa}") | |
@@ -514,6 +518,10 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})") | |
if(NOT ${arg_NO_PRIVATE_MODULE}) | |
list(APPEND exported_targets ${target_private}) | |
endif() | |
+ | |
+ qt_internal_get_target_property(public_header_destination ${target} _qt_public_header_destination) | |
+ qt_internal_get_target_property(private_header_destination ${target} _qt_private_header_destination) | |
+ | |
set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets") | |
qt_install(TARGETS ${exported_targets} | |
EXPORT ${export_name} | |
@@ -521,8 +529,8 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})") | |
LIBRARY DESTINATION ${INSTALL_LIBDIR} | |
ARCHIVE DESTINATION ${INSTALL_LIBDIR} | |
FRAMEWORK DESTINATION ${INSTALL_LIBDIR} | |
- PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module_include_name} | |
- PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module_include_name}/${PROJECT_VERSION}/${module}/private | |
+ ${public_header_destination} | |
+ ${private_header_destination} | |
) | |
qt_apply_rpaths(TARGET "${target}" INSTALL_PATH "${INSTALL_LIBDIR}" RELATIVE_RPATH) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment