From 2e58595a633b6b5d42aa8b5892f47807f6ea5df8 Mon Sep 17 00:00:00 2001 From: Charles PIGNEROL <> Date: Fri, 28 Aug 2026 10:29:47 +0200 Subject: [PATCH] Version 6.4.0. Use of the separate_debug_infos function from GUIToolkitsVariables. --- cmake/version.cmake | 4 ++-- src/PrefsCore/CMakeLists.txt | 4 +++- src/PrefsQt/CMakeLists.txt | 5 ++++- src/PrefsXerces/CMakeLists.txt | 5 ++++- versions.txt | 7 +++++++ 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index 4e6fded..af57021 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -3,8 +3,8 @@ # set (PREFERENCES_MAJOR_VERSION "6") -set (PREFERENCES_MINOR_VERSION "3") -set (PREFERENCES_RELEASE_VERSION "1") +set (PREFERENCES_MINOR_VERSION "4") +set (PREFERENCES_RELEASE_VERSION "0") set (PREFERENCES_VERSION ${PREFERENCES_MAJOR_VERSION}.${PREFERENCES_MINOR_VERSION}.${PREFERENCES_RELEASE_VERSION}) diff --git a/src/PrefsCore/CMakeLists.txt b/src/PrefsCore/CMakeLists.txt index 4b41a6d..24638cf 100644 --- a/src/PrefsCore/CMakeLists.txt +++ b/src/PrefsCore/CMakeLists.txt @@ -1,11 +1,12 @@ set (CURRENT_PACKAGE_NAME "PrefsCore") set (CURRENT_PACKAGE_MACRO_NAME "PREFERENCES") -find_package (GUIToolkitsVariables) +find_package (GUIToolkitsVariables 1.7 REQUIRED) include (${CMAKE_SOURCE_DIR}/cmake/version.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake) +include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake) find_package (TkUtil 6 REQUIRED) file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h) @@ -26,6 +27,7 @@ target_link_libraries (PrefsCore PUBLIC TkUtil::TkUtil) # Etre capable une fois installée de retrouver TkUtil, ... : # (Rem : en son absence on a Set runtime path of "/tmp/pignerol/install/lib/libPrefsCore.so.5.0.0" to "") ... set_target_properties (PrefsCore PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1) +separate_debug_infos (PrefsCore ${CMAKE_INSTALL_PREFIX}/src) # INSTALLATION : include(CMakePackageConfigHelpers) diff --git a/src/PrefsQt/CMakeLists.txt b/src/PrefsQt/CMakeLists.txt index ff402dc..dedcc1d 100644 --- a/src/PrefsQt/CMakeLists.txt +++ b/src/PrefsQt/CMakeLists.txt @@ -1,12 +1,13 @@ set (CURRENT_PACKAGE_NAME "PrefsQt") set (CURRENT_PACKAGE_MACRO_NAME "PREFERENCES") -find_package (GUIToolkitsVariables) +find_package (GUIToolkitsVariables 1.7 REQUIRED) include (${CMAKE_SOURCE_DIR}/cmake/version.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/common_qt.cmake) # QT_MAJOR include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake) +include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake) find_package (QtUtil 6 REQUIRED) find_package(Qt${QT_MAJOR}Core ${QT_MAJOR} NO_CMAKE_SYSTEM_PATH) # In order to enable moc ... @@ -31,6 +32,8 @@ target_link_libraries (PrefsQt PUBLIC QtUtil::QtUtil PrefsXerces) # Etre capable une fois installée de retrouver TkUtil, XercesC, Qt*, ... : # (Rem : en son absence on a Set runtime path of "/tmp/pignerol/install/lib/libPrefsQt.so.5.0.0" to "") ... set_target_properties (PrefsQt PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1 INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) +separate_debug_infos (PrefsQt ${CMAKE_INSTALL_PREFIX}/src) + # Inefficace ici : CMAKE_AUTOMOC => dans le CMakeLists.txt racine #set (CMAKE_AUTOMOC ON) diff --git a/src/PrefsXerces/CMakeLists.txt b/src/PrefsXerces/CMakeLists.txt index 2af3687..1ce87c5 100644 --- a/src/PrefsXerces/CMakeLists.txt +++ b/src/PrefsXerces/CMakeLists.txt @@ -1,10 +1,12 @@ set (CURRENT_PACKAGE_NAME "PrefsXerces") set (CURRENT_PACKAGE_MACRO_NAME "PREFERENCES") -find_package (GUIToolkitsVariables) +find_package (GUIToolkitsVariables 1.7 REQUIRED) include (${CMAKE_SOURCE_DIR}/cmake/version.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake) +include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake) + #include (FindXercesC) # Non car on ne peut pas choisir la version # The FindXercesC.cmake file is deployed in GUIToolkitsVariables_CMAKE_DIR list(APPEND CMAKE_MODULE_PATH ${GUIToolkitsVariables_CMAKE_DIR}) @@ -41,6 +43,7 @@ target_link_libraries (PrefsXerces PUBLIC PrefsCore XercesC::XercesC) # Etre capable une fois installée de retrouver TkUtil, XercesC, ... : # (Rem : en son absence on a Set runtime path of "/tmp/pignerol/install/lib/libPrefsXerces.so.5.0.0" to "") ... set_target_properties (PrefsXerces PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1 INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) +separate_debug_infos (PrefsXerces ${CMAKE_INSTALL_PREFIX}/src) # INSTALLATION : include(CMakePackageConfigHelpers) diff --git a/versions.txt b/versions.txt index 1ad4482..25b12c9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,10 @@ +Version 6.4.0 : 28/08/26 +=============== + +Utilisation de la fonction separate_debug_infos de séparations des informations de débogage du binaire +de GUIToolkitsVariables. + + Version 6.3.1 : 14/12/23 ===============