Skip to content

Version 6.4.0. Use of the separate_debug_infos function from GUIToolk… #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CharlesPignerol merged 1 commit into from
Aug 28, 2026
Merged

Version 6.4.0. Use of the separate_debug_infos function from GUIToolk… #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})


4 changes: 3 additions & 1 deletion src/PrefsCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion src/PrefsQt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ...
Expand All @@ -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)

Expand Down
5 changes: 4 additions & 1 deletion src/PrefsXerces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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})
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
===============

Expand Down