Skip to content

Commit cc5bffc

Browse files
Merge pull request #15 from LIHPC-Computational-Geometry/separate_debug_infos
Version 6.5.0. Use of the separate_debug_infos function from GUIToolk…
2 parents a10518b + c8035af commit cc5bffc

4 files changed

Lines changed: 15 additions & 4 deletions

File tree

‎cmake/version.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# Pour la bibliothèque QtPython3 :
1212
set (QT_PYTHON_3_MAJOR_VERSION "6")
13-
set (QT_PYTHON_3_MINOR_VERSION "4")
14-
set (QT_PYTHON_3_RELEASE_VERSION "7")
13+
set (QT_PYTHON_3_MINOR_VERSION "5")
14+
set (QT_PYTHON_3_RELEASE_VERSION "0")
1515
set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION})
1616

‎src/QtPython/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
set (CURRENT_PACKAGE_NAME "QtPython")
22
set (CURRENT_PACKAGE_MACRO_NAME "QT_PYTHON")
33

4-
find_package (GUIToolkitsVariables)
4+
find_package (GUIToolkitsVariables 1.7 REQUIRED)
55

66
include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
77
include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
88
include (${GUIToolkitsVariables_CMAKE_DIR}/python_binding.cmake)
99
include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
10+
include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake)
1011

1112
# Le répertoire des scripts python :
1213
set (QT_PYTHON_SCRIPTS_DIR "${CMAKE_INSTALL_PREFIX}/${PYTHON_BINDING_DIR}")
@@ -45,6 +46,7 @@ target_include_directories (QtPython PUBLIC ${QT_INC_DEPENDENCIES} ${Python2_INC
4546
# Etre capable une fois installée de retrouver QtUtil, TkUtil, Qt5*, ... :
4647
# (Rem : en son absence on a Set runtime path of "/tmp/pignerol/install/lib/libQtPython.so.5.0.0" to "") ...
4748
set_target_properties (QtPython PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
49+
separate_debug_infos (QtPython ${CMAKE_INSTALL_PREFIX}/src)
4850

4951
# INSTALLATION :
5052
include(CMakePackageConfigHelpers)

‎src/QtPython3/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
set (CURRENT_PACKAGE_NAME "QtPython3")
22
set (CURRENT_PACKAGE_MACRO_NAME "QT_PYTHON_3")
33

4-
find_package (GUIToolkitsVariables)
4+
find_package (GUIToolkitsVariables 1.7 REQUIRED)
55

66
include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
77
include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
88
include (${GUIToolkitsVariables_CMAKE_DIR}/common_qt.cmake) # QT_MAJOR
99
include (${GUIToolkitsVariables_CMAKE_DIR}/python_binding.cmake)
1010
include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
11+
include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake)
1112

1213
# Le répertoire des scripts python :
1314
set (QT_PYTHON_SCRIPTS_DIR "${CMAKE_INSTALL_PREFIX}/${PYTHON_BINDING_DIR}")
@@ -46,6 +47,7 @@ target_include_directories (QtPython3 PUBLIC ${QT_INC_DEPENDENCIES} ${Python3_IN
4647
# Etre capable une fois installée de retrouver QtUtil, TkUtil, Qt5*, ... :
4748
# (Rem : en son absence on a Set runtime path of "/tmp/pignerol/install/lib/libQtPython3.so.5.0.0" to "") ...
4849
set_target_properties (QtPython3 PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
50+
separate_debug_infos (QtPython3 ${CMAKE_INSTALL_PREFIX}/src)
4951

5052
# INSTALLATION :
5153
include(CMakePackageConfigHelpers)

‎versions.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 6.5.0 : 28/08/26
2+
===============
3+
4+
Utilisation de la fonction separate_debug_infos de séparations des informations de débogage du binaire
5+
de GUIToolkitsVariables.
6+
7+
18
Version 6.4.7 : 06/12/24
29
===============
310

0 commit comments

Comments
 (0)