Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# Pour la bibliothèque QtPython3 :
set (QT_PYTHON_3_MAJOR_VERSION "6")
set (QT_PYTHON_3_MINOR_VERSION "4")
set (QT_PYTHON_3_RELEASE_VERSION "7")
set (QT_PYTHON_3_MINOR_VERSION "5")
set (QT_PYTHON_3_RELEASE_VERSION "0")
set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION})

4 changes: 3 additions & 1 deletion src/QtPython/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
set (CURRENT_PACKAGE_NAME "QtPython")
set (CURRENT_PACKAGE_MACRO_NAME "QT_PYTHON")

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}/python_binding.cmake)
include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake)

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

# INSTALLATION :
include(CMakePackageConfigHelpers)
Expand Down
4 changes: 3 additions & 1 deletion src/QtPython3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
set (CURRENT_PACKAGE_NAME "QtPython3")
set (CURRENT_PACKAGE_MACRO_NAME "QT_PYTHON_3")

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}/python_binding.cmake)
include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
include (${GUIToolkitsVariables_CMAKE_DIR}/utilities.cmake)

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

# INSTALLATION :
include(CMakePackageConfigHelpers)
Expand Down
7 changes: 7 additions & 0 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 6.5.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.4.7 : 06/12/24
===============

Expand Down