Skip to content

Commit 416d59b

Browse files
committed
[Release] Release of the 1.00.7 version
1 parent 56ea02f commit 416d59b

13 files changed

+693
-247
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
1010
project (simlfs)
1111
set_project_names (simlfs SimLFS)
1212
set_project_brief ("C++ Simulated Low Fare Search (LFS) Library")
13-
set_project_versions (1 00 6)
13+
set_project_versions (1 00 7)
1414

1515
##
1616
# Project options

ChangeLog

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Mon Jan 27 2025 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.7
2+
- Upgraded CMake support files
3+
14
* Sat Mar 23 2024 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.6
25
- Upgraded CMake support files
36

NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* 2025-01-27:
2+
- Version 1.00.7
3+
- Upgraded CMake support files
4+
15
* 2024-03-23:
26
- Version 1.00.6
37
- Upgraded CMake support files

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ To customise the following to your environment, you can alter the path
5656
to the installation directory:
5757
```bash
5858
export INSTALL_BASEDIR="${HOME}/dev/deliveries"
59-
export LFS_VER="1.00.6"
59+
export LFS_VER="1.00.7"
6060
if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; fi
6161
export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX"
6262
``

autogen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
#
5252
VERSION_MAJOR=1
5353
VERSION_MINOR=00
54-
VERSION_PATCH=6
54+
VERSION_PATCH=7
5555
VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt | sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
5656
VERSION_STRING=`echo "${VERSION_TMP_STRING}" | grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`
5757

config/FindDoxygenWrapper.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ if (DOXYGEN_FOUND STREQUAL "YES")
88
execute_process (
99
COMMAND ${DOXYGEN_EXECUTABLE} --version
1010
OUTPUT_VARIABLE MY_TMP
11-
OUTPUT_STRIP_TRAILING_WHITESPACE
12-
)
11+
OUTPUT_STRIP_TRAILING_WHITESPACE)
1312
set (DOXYGEN_VERSION ${MY_TMP})
1413

1514
# Check the version requirement only

config/FindMySQL.cmake

+3-6
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@ if (UNIX)
2626
execute_process (
2727
COMMAND ${MYSQL_CONFIG} --version
2828
OUTPUT_VARIABLE MY_TMP
29-
OUTPUT_STRIP_TRAILING_WHITESPACE
30-
)
29+
OUTPUT_STRIP_TRAILING_WHITESPACE)
3130
set (MYSQL_VERSION ${MY_TMP})
3231

3332
# Set INCLUDE_DIR
3433
execute_process (
3534
COMMAND ${MYSQL_CONFIG} --include
3635
OUTPUT_VARIABLE MY_TMP
37-
OUTPUT_STRIP_TRAILING_WHITESPACE
38-
)
36+
OUTPUT_STRIP_TRAILING_WHITESPACE)
3937

4038
string (REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
4139
set (MYSQL_ADD_INCLUDE_PATH ${MY_TMP} CACHE FILEPATH INTERNAL)
@@ -44,8 +42,7 @@ if (UNIX)
4442
execute_process (
4543
COMMAND ${MYSQL_CONFIG} --libs_r
4644
OUTPUT_VARIABLE MY_TMP
47-
OUTPUT_STRIP_TRAILING_WHITESPACE
48-
)
45+
OUTPUT_STRIP_TRAILING_WHITESPACE)
4946

5047
set (MYSQL_ADD_LIBRARIES "")
5148
string (REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}")

config/FindPython.cmake

+85-34
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,25 @@ This module defines the following :ref:`Imported Targets <Imported Targets>`:
7777
:prop_gbl:`CMAKE_ROLE` is ``PROJECT``.
7878
7979
``Python::Interpreter``
80-
Python interpreter. Target defined if component ``Interpreter`` is found.
80+
Python interpreter. This target is defined only if the ``Interpreter``
81+
component is found.
82+
``Python::InterpreterDebug``
83+
.. versionadded:: 3.30
84+
85+
Python debug interpreter. This target is defined only if the ``Interpreter``
86+
component is found and the ``Python_EXECUTABLE_DEBUG`` variable is defined.
87+
The target is only defined on the ``Windows`` platform.
88+
89+
``Python::InterpreterMultiConfig``
90+
.. versionadded:: 3.30
91+
92+
Python interpreter. The release or debug version of the interpreter will be
93+
used, based on the context (platform, configuration).
94+
This target is defined only if the ``Interpreter`` component is found
95+
8196
``Python::Compiler``
82-
Python compiler. Target defined if component ``Compiler`` is found.
97+
Python compiler. This target is defined only if the ``Compiler`` component is
98+
found.
8399
84100
``Python::Module``
85101
.. versionadded:: 3.15
@@ -114,6 +130,20 @@ This module will set the following variables in your project
114130
System has the Python interpreter.
115131
``Python_EXECUTABLE``
116132
Path to the Python interpreter.
133+
``Python_EXECUTABLE_DEBUG``
134+
.. versionadded:: 3.30
135+
136+
Path to the debug Python interpreter. It is only defined on the ``Windows``
137+
platform.
138+
139+
``Python_INTERPRETER``
140+
.. versionadded:: 3.30
141+
142+
Path to the Python interpreter, defined as a
143+
:manual:`generator expression <cmake-generator-expressions(7)>` selecting
144+
the ``Python_EXECUTABLE`` or ``Python_EXECUTABLE_DEBUG`` variable based on
145+
the context (platform, configuration).
146+
117147
``Python_INTERPRETER_ID``
118148
A short string unique to the interpreter. Possible values include:
119149
* Python
@@ -125,38 +155,28 @@ This module will set the following variables in your project
125155
``Python_STDLIB``
126156
Standard platform independent installation directory.
127157
128-
Information returned by
129-
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=True)``
130-
or else ``sysconfig.get_path('stdlib')``.
158+
Information returned by ``sysconfig.get_path('stdlib')``.
131159
``Python_STDARCH``
132160
Standard platform dependent installation directory.
133161
134-
Information returned by
135-
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=True)``
136-
or else ``sysconfig.get_path('platstdlib')``.
162+
Information returned by ``sysconfig.get_path('platstdlib')``.
137163
``Python_SITELIB``
138164
Third-party platform independent installation directory.
139165
140-
Information returned by
141-
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False)``
142-
or else ``sysconfig.get_path('purelib')``.
166+
Information returned by ``sysconfig.get_path('purelib')``.
143167
``Python_SITEARCH``
144168
Third-party platform dependent installation directory.
145169
146-
Information returned by
147-
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False)``
148-
or else ``sysconfig.get_path('platlib')``.
170+
Information returned by ``sysconfig.get_path('platlib')``.
149171
150172
``Python_SOABI``
151173
.. versionadded:: 3.17
152174
153175
Extension suffix for modules.
154176
155-
Information computed from ``distutils.sysconfig.get_config_var('EXT_SUFFIX')``
156-
or ``distutils.sysconfig.get_config_var('SOABI')`` or
157-
``python3-config --extension-suffix``. If package ``distutils.sysconfig`` is
158-
not available, ``sysconfig.get_config_var('EXT_SUFFIX')`` or
159-
``sysconfig.get_config_var('SOABI')`` are used.
177+
Information computed from ``sysconfig.get_config_var('EXT_SUFFIX')`` or
178+
``sysconfig.get_config_var('SOABI')`` or
179+
``python3-config --extension-suffix``.
160180
161181
``Python_SOSABI``
162182
.. versionadded:: 3.26
@@ -204,6 +224,17 @@ This module will set the following variables in your project
204224
205225
The Python include directories.
206226
227+
``Python_DEFINITIONS``
228+
.. versionadded:: 3.30.3
229+
230+
The Python preprocessor definitions.
231+
232+
``Python_DEBUG_POSTFIX``
233+
.. versionadded:: 3.30
234+
235+
Postfix of debug python module. This variable can be used to define the
236+
:prop_tgt:`DEBUG_POSTFIX` target property.
237+
207238
``Python_LINK_OPTIONS``
208239
.. versionadded:: 3.19
209240
@@ -284,42 +315,54 @@ Hints
284315
285316
This hint will be honored only when searched for ``Python`` version 3.
286317
287-
.. note::
318+
The ``Python_FIND_ABI`` variable is a 4-tuple specifying, in that order,
319+
``pydebug`` (``d``), ``pymalloc`` (``m``), ``unicode`` (``u``) and
320+
``gil_disabled`` (``t``) flags.
288321
289-
If ``Python_FIND_ABI`` is not defined, any ABI will be searched.
322+
.. versionadded:: 3.30
323+
A fourth element, specifying the ``gil_disabled`` flag (i.e. free
324+
threaded python), is added and is optional. If not specified, the value is
325+
``OFF``.
290326
291-
The ``Python_FIND_ABI`` variable is a 3-tuple specifying, in that order,
292-
``pydebug`` (``d``), ``pymalloc`` (``m``) and ``unicode`` (``u``) flags.
293327
Each element can be set to one of the following:
294328
295329
* ``ON``: Corresponding flag is selected.
296330
* ``OFF``: Corresponding flag is not selected.
297331
* ``ANY``: The two possibilities (``ON`` and ``OFF``) will be searched.
298332
299-
From this 3-tuple, various ABIs will be searched starting from the most
300-
specialized to the most general. Moreover, ``debug`` versions will be
301-
searched **after** ``non-debug`` ones.
333+
.. note::
334+
335+
If ``Python3_FIND_ABI`` is not defined, any ABI, excluding the
336+
``gil_disabled`` flag, will be searched.
337+
338+
From this 4-tuple, various ABIs will be searched starting from the most
339+
specialized to the most general. Moreover, when ``ANY`` is specified for
340+
``pydebug`` and ``gil_disabled``, ``debug`` and ``free threaded`` versions
341+
will be searched **after** ``non-debug`` and ``non-gil-disabled`` ones.
302342
303343
For example, if we have::
304344
305-
set (Python_FIND_ABI "ON" "ANY" "ANY")
345+
set (Python_FIND_ABI "ON" "ANY" "ANY" "ON")
306346
307347
The following flags combinations will be appended, in that order, to the
308-
artifact names: ``dmu``, ``dm``, ``du``, and ``d``.
348+
artifact names: ``tdmu``, ``tdm``, ``tdu``, and ``td``.
309349
310350
And to search any possible ABIs::
311351
312-
set (Python_FIND_ABI "ANY" "ANY" "ANY")
352+
set (Python_FIND_ABI "ANY" "ANY" "ANY" "ANY")
313353
314354
The following combinations, in that order, will be used: ``mu``, ``m``,
315-
``u``, ``<empty>``, ``dmu``, ``dm``, ``du`` and ``d``.
355+
``u``, ``<empty>``, ``dmu``, ``dm``, ``du``, ``d``, ``tmu``, ``tm``, ``tu``,
356+
``t``, ``tdmu``, ``tdm``, ``tdu``, and ``td``.
316357
317358
.. note::
318359
319-
This hint is useful only on ``POSIX`` systems. So, on ``Windows`` systems,
360+
This hint is useful only on ``POSIX`` systems except for the
361+
``gil_disabled`` flag. So, on ``Windows`` systems,
320362
when ``Python_FIND_ABI`` is defined, ``Python`` distributions from
321-
`python.org <https://www.python.org/>`_ will be found only if value for
322-
each flag is ``OFF`` or ``ANY``.
363+
`python.org <https://www.python.org/>`_ will be found only if the value for
364+
each flag is ``OFF`` or ``ANY`` except for the fourth one
365+
(``gil_disabled``).
323366
324367
``Python_FIND_STRATEGY``
325368
.. versionadded:: 3.15
@@ -335,6 +378,8 @@ Hints
335378
constraints is founded.
336379
This is the default if policy :policy:`CMP0094` is set to ``NEW``.
337380
381+
See also ``Python_FIND_UNVERSIONED_NAMES``.
382+
338383
``Python_FIND_REGISTRY``
339384
.. versionadded:: 3.13
340385
@@ -406,7 +451,7 @@ Hints
406451
See `IronPython <https://ironpython.net>`_.
407452
* ``PyPy``: This implementation use ``RPython`` language and
408453
``RPython translation toolchain`` to produce the python interpreter.
409-
See `PyPy <https://www.pypy.org>`_.
454+
See `PyPy <https://pypy.org>`_.
410455
411456
The default value is:
412457
@@ -442,6 +487,8 @@ Hints
442487
This is the default.
443488
* ``NEVER``: The generic name are not searched at all.
444489
490+
See also ``Python_FIND_STRATEGY``.
491+
445492
Artifacts Specification
446493
^^^^^^^^^^^^^^^^^^^^^^^
447494
@@ -543,6 +590,10 @@ If the library type is not specified, ``MODULE`` is assumed.
543590
544591
When option ``WITH_SOABI`` is also specified, the module suffix will include
545592
the ``Python_SOSABI`` value, if any.
593+
594+
.. versionadded:: 3.30
595+
For ``MODULE`` type, the :prop_tgt:`DEBUG_POSTFIX` target property is
596+
initialized with the value of ``Python_DEBUG_POSTFIX`` variable if defined.
546597
#]=======================================================================]
547598

548599

0 commit comments

Comments
 (0)