summaryrefslogtreecommitdiffstats
path: root/cmake/QtModuleHelpers.cmake
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2020-11-02 12:40:57 +0100
committerCristian Adam <cristian.adam@qt.io>2020-11-04 01:41:06 +0100
commit68f3e37449223466723a1ebc5b4f712634f993ac (patch)
treee74e4b42139499882c61de4832f086bf7569bc75 /cmake/QtModuleHelpers.cmake
parentf6418343f1f8c08654f30191c1d8059761a016eb (diff)
CMake Build: Enable separate debug info for all target types
Now all shared libraries and executables will get .debug files on the platforms that support FEATURE_separate_debug_info With the directory property _qt_skip_separate_debug_info certain targets can retain the debug symbols in the binary e.g. lupdate with MinGW 8.1.0 will cause objcopy / strip to fail. Fixes: QTBUG-87015 Change-Id: I03b106e68ef0a42011d1ba641e6f686b2e7b7fb4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
-rw-r--r--cmake/QtModuleHelpers.cmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index b75b67f441..a628ac923d 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -79,10 +79,6 @@ function(qt_internal_add_module target)
endif()
endif()
- if(QT_FEATURE_separate_debug_info AND is_shared_lib AND (UNIX OR MINGW))
- qt_enable_separate_debug_info(${target} ${INSTALL_LIBDIR})
- endif()
-
if (ANDROID)
qt_android_apply_arch_suffix("${target}")
endif()
@@ -612,6 +608,11 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
qt_finalize_framework_headers_copy(${target})
endif()
+ set(debug_install_dir "${INSTALL_LIBDIR}")
+ if (MINGW)
+ set(debug_install_dir "${INSTALL_BINDIR}")
+ endif()
+ qt_enable_separate_debug_info(${target} "${debug_install_dir}")
set(pdb_install_dir "${INSTALL_BINDIR}")
if(NOT is_shared_lib)
set(pdb_install_dir "${INSTALL_LIBDIR}")