diff options
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 81c088fe23..a7315550e2 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -748,9 +748,8 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")") qt_install(DIRECTORY "${arg_EXTERNAL_HEADERS_DIR}/" DESTINATION "${module_install_interface_include_dir}" ) - unset(public_header_destination) - else() - set(public_header_destination PUBLIC_HEADER DESTINATION "${module_install_interface_include_dir}") + get_target_property(public_header_backup ${target} PUBLIC_HEADER) + set_property(TARGET ${target} PROPERTY PUBLIC_HEADER "") endif() qt_install(TARGETS ${exported_targets} @@ -760,8 +759,12 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")") ARCHIVE DESTINATION ${INSTALL_LIBDIR} FRAMEWORK DESTINATION ${INSTALL_LIBDIR} PRIVATE_HEADER DESTINATION "${module_install_interface_private_include_dir}" - ${public_header_destination} - ) + PUBLIC_HEADER DESTINATION "${module_install_interface_include_dir}" + ) + if(arg_EXTERNAL_HEADERS_DIR) + set_property(TARGET ${target} PROPERTY PUBLIC_HEADER ${public_header_backup}) + unset(public_header_backup) + endif() if(BUILD_SHARED_LIBS) qt_apply_rpaths(TARGET "${target}" INSTALL_PATH "${INSTALL_LIBDIR}" RELATIVE_RPATH) |