Skip to content

Commit

Permalink
[Release] Release of the 1.00.10 version
Browse files Browse the repository at this point in the history
  • Loading branch information
da115115 committed Mar 23, 2024
1 parent 39d08fb commit 04cbac5
Show file tree
Hide file tree
Showing 16 changed files with 308 additions and 199 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
cmake_minimum_required (VERSION 3.0)
cmake_minimum_required (VERSION 3.15..)

##
# CMake macros for the project
Expand All @@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
project (rmol)
set_project_names (rmol)
set_project_brief ("C++ library of Revenue Management and Optimisation classes and functions")
set_project_versions (1 00 9)
set_project_versions (1 00 10)

##
# Project options
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Sat Mar 23 2024 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.10
- Upgraded CMake support files

* Mon May 01 2023 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.9
- Upgraded CMake support files

Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* 2024-03-23:
- Version 1.00.10
- Upgraded CMake support files

* 2023-05-01:
- Version 1.00.9
- Upgraded CMake support files
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ $ dnf -y install rmol-devel rmol-doc

You can also get the RPM packages (which may work on Linux
distributions like Suse and Mandriva) from the Fedora repository
(_e.g._, for Fedora 38,
https://fr2.rpmfind.net/linux/RPM/fedora/38/x86_64/)
(_e.g._, for Fedora Rawhide,
https://fr2.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/)


## Building the library and test binary from Git repository
Expand Down Expand Up @@ -79,7 +79,7 @@ If MetaSim is not used, in order to customise the following to your
environment, you can alter the path to the installation directory:
```bash
export INSTALL_BASEDIR="${HOME}/dev/deliveries"
export RMOL_VER="1.00.9"
export RMOL_VER="1.00.10"
if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; fi
export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX"
```
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fi
#
VERSION_MAJOR=1
VERSION_MINOR=00
VERSION_PATCH=9
VERSION_PATCH=10
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]\+$"`

Expand Down
22 changes: 19 additions & 3 deletions config/FindBoost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_TIMER_DEPENDENCIES chrono)
set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
else()
elseif(Boost_VERSION_STRING VERSION_LESS 1.83.0)
set(_Boost_CONTRACT_DEPENDENCIES thread chrono)
set(_Boost_COROUTINE_DEPENDENCIES context)
set(_Boost_FIBER_DEPENDENCIES context)
Expand All @@ -1380,7 +1380,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_TIMER_DEPENDENCIES chrono)
set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.82.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
else()
set(_Boost_CONTRACT_DEPENDENCIES thread chrono)
set(_Boost_COROUTINE_DEPENDENCIES context)
set(_Boost_FIBER_DEPENDENCIES context)
set(_Boost_IOSTREAMS_DEPENDENCIES regex)
set(_Boost_JSON_DEPENDENCIES container)
set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic)
set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l)
set(_Boost_MPI_DEPENDENCIES serialization)
set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
set(_Boost_THREAD_DEPENDENCIES chrono atomic)
set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.85.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
endif()
endif()
Expand Down Expand Up @@ -1445,6 +1459,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp")
set(_Boost_MPI_HEADERS "boost/mpi.hpp")
set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp")
set(_Boost_MYSQL_HEADERS "boost/mysql.hpp")
set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp")
set(_Boost_NOWIDE_HEADERS "boost/nowide/cstdlib.hpp")
set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp")
Expand Down Expand Up @@ -1654,7 +1669,8 @@ else()
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
# _Boost_COMPONENT_DEPENDENCIES.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
"1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79"
"1.84.0" "1.84"
"1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79"
"1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
"1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
"1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
Expand Down
2 changes: 1 addition & 1 deletion config/FindDoxygenWrapper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Extract the version information
if (DOXYGEN_FOUND STREQUAL "YES")
exec_program (${DOXYGEN_EXECUTABLE} ARGS --version OUTPUT_VARIABLE MY_TMP)
execute_process (COMMAND ${DOXYGEN_EXECUTABLE} --version OUTPUT_VARIABLE MY_TMP)
set (DOXYGEN_VERSION ${MY_TMP})

# Check the version requirement only
Expand Down
12 changes: 7 additions & 5 deletions config/FindMySQL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ if (UNIX)
if (MYSQL_CONFIG)
message (STATUS "Using mysql-config: ${MYSQL_CONFIG}")
# Set VERSION
exec_program (${MYSQL_CONFIG} ARGS --version OUTPUT_VARIABLE MY_TMP)
execute_process (COMMAND ${MYSQL_CONFIG} --version OUTPUT_VARIABLE MY_TMP)
set (MYSQL_VERSION ${MY_TMP})

# Set INCLUDE_DIR
exec_program (${MYSQL_CONFIG} ARGS --include OUTPUT_VARIABLE MY_TMP)
execute_process (COMMAND ${MYSQL_CONFIG} --include OUTPUT_VARIABLE MY_TMP)

string (REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
set (MYSQL_ADD_INCLUDE_PATH ${MY_TMP} CACHE FILEPATH INTERNAL)
#message("[DEBUG] MYSQL ADD_INCLUDE_PATH : ${MYSQL_ADD_INCLUDE_PATH}")
# set LIBRARY_DIR
exec_program (${MYSQL_CONFIG} ARGS --libs_r OUTPUT_VARIABLE MY_TMP)
execute_process (COMMAND ${MYSQL_CONFIG} --libs_r OUTPUT_VARIABLE MY_TMP)

set (MYSQL_ADD_LIBRARIES "")
string (REGEX MATCHALL "-l[^ ]*" MYSQL_LIB_LIST "${MY_TMP}")
Expand Down Expand Up @@ -83,11 +83,13 @@ if (UNIX)
foreach (LIB ${MYSQL_ADD_LIBRARIES})
find_library (MYSQL_LIBRARY
NAMES
mysql libmysql ${LIB}
mysql libmysql mysqlclient libmysqlclient ${LIB}
PATHS
${MYSQL_ADD_LIBRARIES_PATH}
/usr/lib64
/usr/lib
/usr/lib/mysql
/usr/lib64/mysql
/usr/local/lib
/usr/local/lib/mysql
/usr/local/mysql/lib
Expand All @@ -98,7 +100,7 @@ endif (UNIX)
if (WIN32)
find_library (MYSQL_LIBRARY
NAMES
mysql libmysql ${LIB}
mysql libmysql mysqlclient libmysqlclient ${LIB}
PATHS
${MYSQL_ADD_LIBRARIES_PATH}
"C:/Program Files/MySQL/lib"
Expand Down
28 changes: 11 additions & 17 deletions config/FindPython.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,38 +125,28 @@ This module will set the following variables in your project
``Python_STDLIB``
Standard platform independent installation directory.

Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=True)``
or else ``sysconfig.get_path('stdlib')``.
Information returned by ``sysconfig.get_path('stdlib')``.
``Python_STDARCH``
Standard platform dependent installation directory.

Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=True)``
or else ``sysconfig.get_path('platstdlib')``.
Information returned by ``sysconfig.get_path('platstdlib')``.
``Python_SITELIB``
Third-party platform independent installation directory.

Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False)``
or else ``sysconfig.get_path('purelib')``.
Information returned by ``sysconfig.get_path('purelib')``.
``Python_SITEARCH``
Third-party platform dependent installation directory.

Information returned by
``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False)``
or else ``sysconfig.get_path('platlib')``.
Information returned by ``sysconfig.get_path('platlib')``.

``Python_SOABI``
.. versionadded:: 3.17

Extension suffix for modules.

Information computed from ``distutils.sysconfig.get_config_var('EXT_SUFFIX')``
or ``distutils.sysconfig.get_config_var('SOABI')`` or
``python3-config --extension-suffix``. If package ``distutils.sysconfig`` is
not available, ``sysconfig.get_config_var('EXT_SUFFIX')`` or
``sysconfig.get_config_var('SOABI')`` are used.
Information computed from ``sysconfig.get_config_var('EXT_SUFFIX')`` or
``sysconfig.get_config_var('SOABI')`` or
``python3-config --extension-suffix``.

``Python_SOSABI``
.. versionadded:: 3.26
Expand Down Expand Up @@ -335,6 +325,8 @@ Hints
constraints is founded.
This is the default if policy :policy:`CMP0094` is set to ``NEW``.

See also ``Python_FIND_UNVERSIONED_NAMES``.

``Python_FIND_REGISTRY``
.. versionadded:: 3.13

Expand Down Expand Up @@ -442,6 +434,8 @@ Hints
This is the default.
* ``NEVER``: The generic name are not searched at all.

See also ``Python_FIND_STRATEGY``.

Artifacts Specification
^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
Loading

0 comments on commit 04cbac5

Please sign in to comment.