[Release] Release of 1.00.13

da115115 · da115115 · commit cfeced00134f · 2025-12-25T00:58:44.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
 project (travelccm)
 set_project_names (travelccm TravelCCM)
 set_project_brief ("C++ Travel Customer Choice Model Library")
-set_project_versions (1 00 12)
+set_project_versions (1 00 13)
 
 ##
 # Project options
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+* Thu Dec 25 2025 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.13
+- Upgraded CMake conf for Python
+
 * Wed Dec 17 2025 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.12
 - Fixed a few issues with the doc and man pages
 
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+* 2025-12-25:
+- Version 1.00.13
+- Upgraded CMake conf for Python
+
 * 2025-12-17:
 - Version 1.00.12
 - Fixed a few issues with the doc and man pages
diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ To customise the following to your environment, you can alter the path
 to the installation directory:
 ```bash
 export INSTALL_BASEDIR="${HOME}/dev/deliveries"
-export CCM_VER="1.00.12"
+export CCM_VER="1.00.13"
 ```
 
 Then, as usual:
diff --git a/autogen.sh b/autogen.sh
@@ -51,7 +51,7 @@ fi
 #
 VERSION_MAJOR=1
 VERSION_MINOR=00
-VERSION_PATCH=12
+VERSION_PATCH=13
 VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt | sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
 VERSION_STRING=`echo "${VERSION_TMP_STRING}" | grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`
 
diff --git a/config/FindPython/Support.cmake b/config/FindPython/Support.cmake
@@ -30,7 +30,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
 endif()
 if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
-  set(_${_PYTHON_PREFIX}_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+  set(_${_PYTHON_PREFIX}_VERSIONS 3.15 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
 else()
@@ -625,18 +625,16 @@ function (_PYTHON_GET_CONFIG_VAR _PYTHON_PGCV_VALUE NAME)
         set (_values "_d")
       endif()
     elseif (NAME STREQUAL "ABIFLAGS" AND WIN32)
-      # config var ABIFLAGS does not exist, check GIL specific variable
+      # config var ABIFLAGS does not exist for version < 3.14, check GIL specific variable
       execute_process (COMMAND ${_${_PYTHON_PREFIX}_INTERPRETER_LAUNCHER} "${_${_PYTHON_PREFIX}_EXECUTABLE}" -c
-                               "import sys; import sysconfig; sys.stdout.write(str(sysconfig.get_config_var('Py_GIL_DISABLED')))"
+                               "import sys\nimport sysconfig\ntry:\n   sys.stdout.write(sysconfig.get_config_var('ABIFLAGS'))\nexcept Exception:\n   sys.stdout.write('t' if sysconfig.get_config_var('Py_GIL_DISABLED') == 1 else '<none>')"
                      RESULT_VARIABLE _result
                      OUTPUT_VARIABLE _values
                      ERROR_QUIET
                      OUTPUT_STRIP_TRAILING_WHITESPACE)
-      if (result OR NOT _values EQUAL "1")
+      if (_result OR NOT _values)
         # assume ABI is not supported or GIL is set
         set (_values "<none>")
-      else()
-        set (_values "t")
       endif()
     else()
       set (config_flag "${NAME}")
@@ -4071,7 +4069,11 @@ if(_${_PYTHON_PREFIX}_CMAKE_ROLE STREQUAL "PROJECT")
         set_property (TARGET ${__name}
                       PROPERTY INTERFACE_COMPILE_DEFINITIONS "${${_PYTHON_PREFIX}_DEFINITIONS}")
       endif()
-
+      if(WIN32)
+        # avoid implicit library link (recognized by version 3.14 and upper)
+        set_property (TARGET ${__name}
+                      APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "Py_NO_LINK_LIB")
+      endif()
 
       if (${_PYTHON_PREFIX}_${_PREFIX}LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_RUNTIME_${_PREFIX}LIBRARY_RELEASE)
         # System manage shared libraries in two parts: import and runtime
@@ -4133,6 +4135,11 @@ if(_${_PYTHON_PREFIX}_CMAKE_ROLE STREQUAL "PROJECT")
         set_property (TARGET ${__name}
                       PROPERTY INTERFACE_COMPILE_DEFINITIONS "${${_PYTHON_PREFIX}_DEFINITIONS}")
       endif()
+      if(WIN32)
+        # avoid implicit library link (recognized by version 3.14 and upper)
+        set_property (TARGET ${__name}
+                      APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "Py_NO_LINK_LIB")
+      endif()
 
       # When available, enforce shared library generation with undefined symbols
       if (APPLE)
diff --git a/config/FindPythonInterp.cmake b/config/FindPythonInterp.cmake
@@ -67,7 +67,7 @@ unset(_Python_NAMES)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.15 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonInterp_FIND_VERSION)
     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
diff --git a/config/FindPythonLibs.cmake b/config/FindPythonLibs.cmake
@@ -99,7 +99,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.15 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonLibs_FIND_VERSION)
     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff --git a/config/FindReadline.cmake b/config/FindReadline.cmake
@@ -16,17 +16,20 @@
 #
 # Variables defined by this module:
 #
-#  READLINE_FOUND            System has readline, include and lib dirs found
-#  Readline_INCLUDE_DIR      The readline include directories. 
-#  Readline_LIBRARY          The readline library.
+#  Readline_FOUND            System has readline, include and lib dirs found
+#  Readline_VERSION          The Readline version
+#  Readline_VERSION_MAJOR    The Readline major version
+#  Readline_VERSION_MINOR    The Readline minor version
+#  Readline_INCLUDE_DIR      The readline include directories
+#  Readline_LIBRARY          The readline library
 #
 
 find_path (Readline_ROOT_DIR
   NAMES include/readline/readline.h
 )
 
 find_path (Readline_INCLUDE_DIR
-  NAMES readline/readline.h /usr/include/readline
+  NAMES readline/readline.h
   HINTS ${Readline_ROOT_DIR}/include
 )
   
@@ -35,8 +38,51 @@ find_library (Readline_LIBRARY
   HINTS ${Readline_ROOT_DIR}/lib
 )
 
+  # Extract version information from readline.h
+  if (Readline_INCLUDE_DIR)
+	# Extract Readline_VERSION from readline.h
+	# Read the whole file:
+	set (Readline_VERSION "")
+	set (Readline_VERSION_MAJOR "")
+	set (Readline_VERSION_MINOR "")
+	file (READ "${Readline_INCLUDE_DIR}/readline/readline.h"
+	  _readline_VERSION_HPP_CONTENTS)
+	if (Readline_DEBUG)
+      message (STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+		"location of readline.h: ${Readline_INCLUDE_DIR}/readline/readline.h")
+	endif (Readline_DEBUG)
+  
+	string (REGEX REPLACE ".*#define RL_READLINE_VERSION\t([0-9x]*).*" "\\1"
+	  Readline_VERSION "${_readline_VERSION_HPP_CONTENTS}")
+
+	string (REGEX REPLACE ".*#define RL_VERSION_MAJOR\t([0-9]*).*" "\\1"
+	  Readline_VERSION_MAJOR "${_readline_VERSION_HPP_CONTENTS}")
+
+	string (REGEX REPLACE ".*#define RL_VERSION_MINOR\t([0-9]*).*" "\\1"
+	  Readline_VERSION_MINOR "${_readline_VERSION_HPP_CONTENTS}")
+
+	set (Readline_VERSION ${Readline_VERSION}
+	  CACHE INTERNAL "The version number for Readline")
+
+	set (Readline_VERSION_MAJOR ${Readline_VERSION_MAJOR}
+	  CACHE INTERNAL "The major version number for Readline")
+
+	set (Readline_VERSION_MINOR ${Readline_VERSION_MINOR}
+	  CACHE INTERNAL "The minor version number for Readline")
+
+	#
+	if (Readline_DEBUG)
+      message (STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+		"readline.h reveals Readline ${Readline_VERSION}")
+	endif (Readline_DEBUG)
+	
+  else (Readline_INCLUDE_DIR)
+	set (Readline_ERROR_REASON
+      "${Readline_ERROR_REASON}Unable to find the Readline header files. Please set Readline_ROOT_DIR to the root directory containing Readline or Readline_INCLUDE_DIR to the directory containing Readline's headers.")
+  endif (Readline_INCLUDE_DIR)
+
 if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
-  set(READLINE_FOUND TRUE)
+  set(Readline_FOUND TRUE)
 else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
   FIND_LIBRARY(Readline_LIBRARY NAMES readline)
   include(FindPackageHandleStandardArgs)
@@ -46,6 +92,9 @@ endif(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
 
 mark_as_advanced(
   Readline_ROOT_DIR
+  Readline_VERSION
+  Readline_VERSION_MAJOR
+  Readline_VERSION_MINOR
   Readline_INCLUDE_DIR
   Readline_LIBRARY
 )
diff --git a/config/FindSOCI.cmake b/config/FindSOCI.cmake
@@ -78,8 +78,8 @@ if (SOCI_LIBRARY_DIR)
     NO_DEFAULT_PATH)
 else (SOCI_LIBRARY_DIR)
   find_library (SOCI_LIBRARIES
-    NAMES ${CHECK_LIBRARIES})
-    #PATH_SUFFIXES soci)
+    NAMES ${CHECK_LIBRARIES}
+    PATH_SUFFIXES soci)
 endif (SOCI_LIBRARY_DIR)
 
 ##
diff --git a/config/FindSOCIMySQL.cmake b/config/FindSOCIMySQL.cmake
@@ -39,15 +39,20 @@ if (SOCIMYSQL_LIBRARY_DIR)
     NO_DEFAULT_PATH)
 else (SOCIMYSQL_LIBRARY_DIR)
   find_library (SOCIMYSQL_LIBRARIES
-    NAMES ${CHECK_LIBRARIES})
-    #PATH_SUFFIXES soci)
+    NAMES ${CHECK_LIBRARIES}
+    PATH_SUFFIXES soci)
 endif (SOCIMYSQL_LIBRARY_DIR)
 
 #
 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (SOCIMySQL 
-  REQUIRED_VARS SOCIMYSQL_LIBRARIES SOCIMYSQL_INCLUDE_DIR
-  VERSION_VAR SOCI_HUMAN_VERSION)
+if (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
+  find_package_handle_standard_args (SOCIMySQL 
+	REQUIRED_VARS SOCIMYSQL_LIBRARIES SOCIMYSQL_INCLUDE_DIR
+	VERSION_VAR SOCI_HUMAN_VERSION)
+else (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
+  find_package_handle_standard_args (SOCIMySQL 
+	DEFAULT_MSG SOCIMYSQL_LIBRARIES SOCIMYSQL_INCLUDE_DIR)
+endif (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
 
 if (SOCIMYSQL_FOUND)
   mark_as_advanced (SOCIMYSQL_FOUND SOCIMYSQL_LIBRARIES SOCIMYSQL_INCLUDE_DIR)
diff --git a/config/FindSOCIPostgreSQL.cmake b/config/FindSOCIPostgreSQL.cmake
@@ -0,0 +1,57 @@
+# 
+# Find SOCI includes and library for core and PostgreSQL.
+# Following are the variables defined by the FindSOCI*.cmake macros:
+#  SOCI_VERSION          - The SOCI version, e.g, 300100
+#  SOCI_LIB_VERSION      - The SOCI library version, e.g., 3_1_0
+#  SOCI_HUMAN_VERSION    - The SOCI human-readable version, e.g., 3.1.0
+#  SOCI_INCLUDE_DIR      - Where to find soci.h, etc.
+#  SOCI_LIBRARIES        - List of libraries when using SOCI.
+#  SOCI_FOUND            - Whether SOCI has been found
+#  SOCIPostgreSQL_INCLUDE_DIR - Where to find soci-postgresql.h, etc.
+#  SOCIPostgreSQL_LIBRARIES   - List of libraries when using SOCI PostgreSQL.
+#  SOCIPostgreSQL_FOUND       - Whether the SOCI PostgreSQL library has been found
+#
+# Note: it is assumed that the _required_version variable be set before 
+# calling 'find_package (SOCIPostgreSQL)'
+
+# First, check for SOCI core
+find_package (SOCI ${_required_version} REQUIRED)
+
+# Check for SOCI PostgreSQL main header.
+set (CHECK_HEADERS soci/postgresql/soci-postgresql.h)
+if (SOCIPostgreSQL_INCLUDE_DIR)
+  find_path (SOCIPostgreSQL_INCLUDE_DIR
+    NAMES ${CHECK_HEADERS}
+    PATHS ${SOCI_POSTGRESQL_INCLUDE_DIR}
+    NO_DEFAULT_PATH)
+else (SOCIPostgreSQL_INCLUDE_DIR)
+  find_path (SOCIPostgreSQL_INCLUDE_DIR
+    NAMES ${CHECK_HEADERS}
+    PATHS ${SOCI_INCLUDE_DIR})
+endif (SOCIPostgreSQL_INCLUDE_DIR)
+
+# Check for SOCI PostgreSQL library
+set (CHECK_LIBRARIES soci_postgresql soci_postgresql-gcc-3_0)
+if (SOCIPostgreSQL_LIBRARY_DIR)
+  find_library (SOCIPostgreSQL_LIBRARIES
+    NAMES ${CHECK_LIBRARIES}
+    PATHS ${SOCIPostgreSQL_LIBRARY_DIR}
+    NO_DEFAULT_PATH)
+else (SOCIPostgreSQL_LIBRARY_DIR)
+  find_library (SOCIPostgreSQL_LIBRARIES
+    NAMES ${CHECK_LIBRARIES}
+    PATH_SUFFIXES soci)
+endif (SOCIPostgreSQL_LIBRARY_DIR)
+
+#
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (SOCIPostgreSQL 
+  REQUIRED_VARS SOCIPostgreSQL_LIBRARIES SOCIPostgreSQL_INCLUDE_DIR
+  VERSION_VAR SOCI_HUMAN_VERSION)
+
+if (SOCIPostgreSQL_FOUND)
+  mark_as_advanced (SOCIPostgreSQL_FOUND SOCIPostgreSQL_LIBRARIES SOCIPostgreSQL_INCLUDE_DIR)
+else (SOCIPostgreSQL_FOUND)
+  message (FATAL_ERROR "Could not find the SOCI PostgreSQL libraries! Please install the development-libraries and headers (e.g., 'soci-postgresql-devel' for Fedora/RedHat).")
+endif (SOCIPostgreSQL_FOUND)
+
diff --git a/config/FindSOCISQLite.cmake b/config/FindSOCISQLite.cmake
@@ -39,15 +39,20 @@ if (SOCISQLITE_LIBRARY_DIR)
     NO_DEFAULT_PATH)
 else (SOCISQLITE_LIBRARY_DIR)
   find_library (SOCISQLITE_LIBRARIES
-    NAMES ${CHECK_LIBRARIES})
-    #PATH_SUFFIXES soci)
+    NAMES ${CHECK_LIBRARIES}
+    PATH_SUFFIXES soci)
 endif (SOCISQLITE_LIBRARY_DIR)
 
 #
 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (SOCISQLite 
-  REQUIRED_VARS SOCISQLITE_LIBRARIES SOCISQLITE_INCLUDE_DIR
-  VERSION_VAR SOCI_HUMAN_VERSION)
+if (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
+  find_package_handle_standard_args (SOCISQLite 
+	REQUIRED_VARS SOCISQLITE_LIBRARIES SOCISQLITE_INCLUDE_DIR
+	VERSION_VAR SOCI_HUMAN_VERSION)
+else (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
+  find_package_handle_standard_args (SOCISQLite 
+	DEFAULT_MSG SOCISQLITE_LIBRARIES SOCISQLITE_INCLUDE_DIR)
+endif (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
 
 if (SOCISQLITE_FOUND)
   mark_as_advanced (SOCISQLITE_FOUND SOCISQLITE_LIBRARIES SOCISQLITE_INCLUDE_DIR)
diff --git a/config/project_config_embeddable.cmake b/config/project_config_embeddable.cmake

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ fi`
`51`	`51`	`#`
`52`	`52`	`VERSION_MAJOR=1`
`53`	`53`	`VERSION_MINOR=00`
`54`		`-VERSION_PATCH=12`
	`54`	`+VERSION_PATCH=13`
`55`	`55`	VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt \| sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
`56`	`56`	VERSION_STRING=`echo "${VERSION_TMP_STRING}" \| grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`
`57`	`57`