diff --git a/CMakeLists.txt b/CMakeLists.txt index 521d311..bf07e97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake) project (trademgen) set_project_names (trademgen TraDemGen) set_project_brief ("C++ Simulated Travel Demand Generation Library") -set_project_versions (1 00 4) +set_project_versions (1 00 5) ## # Project options diff --git a/ChangeLog b/ChangeLog index bc5dc3f..407a2d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +* Mon Nov 11 2019 Denis Arnaud - 1.00.5 +- CMake helper files for newer versions of Boost + * Thu Jul 11 2019 Denis Arnaud - 1.00.4 - CMake support files updated for Python 3.8 diff --git a/NEWS b/NEWS index fa50bef..7c7ffd8 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +* 2019-11-11: +- Version 1.00.5 +- CMake helper files for newer versions of Boost + * 2019-07-11: - Version 1.00.4 - CMake support files updated for Python 3.8 diff --git a/README.md b/README.md index a62e6f9..bc850fe 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Summary: --------- TraDemGen aims at providing a clean API, and the corresponding C++ implementation, able to generate demand for travel solutions (e.g., -from JFK to PEK on 25-05-2009) according to characteristics (e.g., +from JFK to PEK on 25-05-2019) according to characteristics (e.g., Willingness-To-Pay, preferred airline, etc). TraDemGen makes an extensive use of existing open-source libraries for @@ -64,10 +64,10 @@ found on GitHub: http://github.com/airsim/trademgen/releases To customise the following to your environment, you can alter the path to the installation directory: ```bash -export INSTALL_BASEDIR=/home/user/dev/deliveries -export TDG_VER=1.00.4 -if [ -d /usr/lib64 ]; then LIBSUFFIX=64; fi -export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX" +export INSTALL_BASEDIR="/home/user/dev/deliveries" +export TDG_VER="1.00.4" +if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; fi +export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=${LIBSUFFIX}" ``` Then, as usual: * To configure the project, type something like: @@ -87,7 +87,7 @@ Then, as usual: ```bash make check ``` -* To install the library (libtrademgen*.so*) and the binary (trademgen), +* To install the library (`libtrademgen*.so*`) and the binary (trademgen), just type: ```bash make install @@ -117,8 +117,12 @@ Then, as usual: ``` * To run the installed version: ```bash - ${INSTALL_BASEDIR}/trademgen-$TDG_VER/bin/trademgen -b - ${INSTALL_BASEDIR}/trademgen-$TDG_VER/bin/trademgen_generateDemand + ${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen -b + ${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/pytrademgen + ${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_generateDemand + ${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_extractBookingRequests + ${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_drawBookingArrivals + ${INSTALL_BASEDIR}/trademgen-${TDG_VER}/bin/trademgen_with_db ``` Denis Arnaud (June 2015) diff --git a/autogen.sh b/autogen.sh index 9de265f..ad75a5b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -51,7 +51,7 @@ fi # VERSION_MAJOR=1 VERSION_MINOR=00 -VERSION_PATCH=4 +VERSION_PATCH=5 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/FindBoost.cmake b/config/FindBoost.cmake index 75e7821..4e7c413 100644 --- a/config/FindBoost.cmake +++ b/config/FindBoost.cmake @@ -1487,13 +1487,13 @@ if(WIN32) INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") endif() -if(POLICY CMP0074) +if (POLICY CMP0074) cmake_policy(GET CMP0074 _Boost_CMP0074) - if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx") - _Boost_CHECK_SPELLING(Boost_ROOT) - endif() - unset(_Boost_CMP0074) endif(POLICY CMP0074) +if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx") + _Boost_CHECK_SPELLING(Boost_ROOT) +endif() +unset(_Boost_CMP0074) _Boost_CHECK_SPELLING(Boost_LIBRARYDIR) _Boost_CHECK_SPELLING(Boost_INCLUDEDIR) diff --git a/config/project_config_embeddable.cmake b/config/project_config_embeddable.cmake index 22c1623..5d44da0 100644 --- a/config/project_config_embeddable.cmake +++ b/config/project_config_embeddable.cmake @@ -2978,6 +2978,7 @@ macro (display_status) message (STATUS) message (STATUS "BUILD_SHARED_LIBS ................. : ${BUILD_SHARED_LIBS}") message (STATUS "CMAKE_BUILD_TYPE .................. : ${CMAKE_BUILD_TYPE}") + message (STATUS " * CMAKE_VERSION .................. : ${CMAKE_VERSION}") message (STATUS " * CMAKE_C_FLAGS .................. : ${CMAKE_C_FLAGS}") message (STATUS " * CMAKE_CXX_FLAGS ................ : ${CMAKE_CXX_FLAGS}") message (STATUS " * BUILD_FLAGS .................... : ${BUILD_FLAGS}")