AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Don't install pri and debug info for bundled harfbuzz and pcre2

Browse Source 
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>
This commit is contained in:
Li Xinwei 2020-11-19 16:49:28 +08:00
parent d8602ce58b
commit 3ef32ce901
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/Qt3rdPartyLibraryHelpers.cmake
View File

@ -168,11 +168,6 @@ function(qt_internal_add_3rdparty_library target)
qt_internal_set_no_exceptions_flags("${target}") qt_internal_set_no_exceptions_flags("${target}")
endif() 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}" qt_internal_extend_target("${target}"
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
@ -196,6 +191,11 @@ function(qt_internal_add_3rdparty_library target)
) )
if(NOT BUILD_SHARED_LIBS OR arg_INSTALL) 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}") set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix}) qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_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} EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target}
CONFIG_INSTALL_DIR "${config_install_dir}" CONFIG_INSTALL_DIR "${config_install_dir}"
) )
endif()
set(debug_install_dir "${INSTALL_LIBDIR}") set(debug_install_dir "${INSTALL_LIBDIR}")
if (MINGW) if (MINGW)
set(debug_install_dir "${INSTALL_BINDIR}") set(debug_install_dir "${INSTALL_BINDIR}")
endif() endif()
qt_enable_separate_debug_info(${target} "${debug_install_dir}") qt_enable_separate_debug_info(${target} "${debug_install_dir}")
qt_internal_install_pdb_files("${target}" "${INSTALL_LIBDIR}") qt_internal_install_pdb_files(${target} "${INSTALL_LIBDIR}")
endif()
endfunction() endfunction()
function(qt_install_3rdparty_library_wrap_config_extra_file target) function(qt_install_3rdparty_library_wrap_config_extra_file target)