diff options
| author | Li Xinwei <1326710505@qq.com> | 2020-11-19 16:49:28 +0800 |
|---|---|---|
| committer | Li Xinwei <1326710505@qq.com> | 2020-11-20 13:30:29 +0000 |
| commit | 3ef32ce901490bb40a87bf6de19748045a605c05 (patch) | |
| tree | 3152fad9f362e2dbce5c02cf67a8d62d33666a9f /cmake | |
| parent | d8602ce58b6ef268be84b9aa0166b0c3fa6a96e8 (diff) | |
CMake: Don't install pri and debug info for bundled harfbuzz and pcre2
For shared build, Qt6BundledHarfbuzz.lib and Qt6BundledPcre2.lib are not
installed. But their pri files(qt_ext_harfbuzz.pri, qt_ext_pcre2.pri)
and debug info files(Qt6BundledHarfbuzz.pdb, Qt6BundledPcre2.pdb) are
still installed. These files should not be installed too.
Pick-to: 6.0.0 6.0
Change-Id: I3e54bec01d94ee3897b485a982d01b24edc602aa
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Qt3rdPartyLibraryHelpers.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index 3eca870ad7..13e67f3524 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -168,11 +168,6 @@ function(qt_internal_add_3rdparty_library target) qt_internal_set_no_exceptions_flags("${target}") endif() - qt_generate_3rdparty_lib_pri_file("${target}" "${arg_QMAKE_LIB_NAME}" pri_file) - if(pri_file) - qt_install(FILES "${pri_file}" DESTINATION "${INSTALL_MKSPECSDIR}/modules") - endif() - qt_internal_extend_target("${target}" SOURCES ${arg_SOURCES} INCLUDE_DIRECTORIES @@ -196,6 +191,11 @@ function(qt_internal_add_3rdparty_library target) ) if(NOT BUILD_SHARED_LIBS OR arg_INSTALL) + qt_generate_3rdparty_lib_pri_file("${target}" "${arg_QMAKE_LIB_NAME}" pri_file) + if(pri_file) + qt_install(FILES "${pri_file}" DESTINATION "${INSTALL_MKSPECSDIR}/modules") + endif() + set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}") qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix}) qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix}) @@ -243,14 +243,14 @@ function(qt_internal_add_3rdparty_library target) EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target} CONFIG_INSTALL_DIR "${config_install_dir}" ) - endif() - set(debug_install_dir "${INSTALL_LIBDIR}") - if (MINGW) - set(debug_install_dir "${INSTALL_BINDIR}") + set(debug_install_dir "${INSTALL_LIBDIR}") + if (MINGW) + set(debug_install_dir "${INSTALL_BINDIR}") + endif() + qt_enable_separate_debug_info(${target} "${debug_install_dir}") + qt_internal_install_pdb_files(${target} "${INSTALL_LIBDIR}") endif() - qt_enable_separate_debug_info(${target} "${debug_install_dir}") - qt_internal_install_pdb_files("${target}" "${INSTALL_LIBDIR}") endfunction() function(qt_install_3rdparty_library_wrap_config_extra_file target) |