X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4bb00c8480e534de5fdf1b16dccbda13421a9fa..c502e0d66a1c71f817190511d1f8271aff20dcc3:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 6943264653..ca5ab2d733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Build the version number set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "29") +set(SIMGRID_VERSION_MINOR "31") set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot if(${SIMGRID_VERSION_PATCH} EQUAL "0") @@ -45,15 +45,15 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") if (CMAKE_COMPILER_IS_GNUCC) - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.0") message(FATAL_ERROR - "SimGrid needs at least g++ version 5.0 to compile but you have ${CMAKE_CXX_COMPILER_VERSION}." - "You need a sufficient support of c++14 to compile SimGrid.") + "SimGrid needs at least g++ version 7.0 to compile but you have ${CMAKE_CXX_COMPILER_VERSION}." + "You need a sufficient support of c++17 to compile SimGrid.") endif() endif() ## We need a decent support of the C++14 and C11 standards -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 11) @@ -227,7 +227,7 @@ set(SIMGRID_HAVE_NS3 0) if(enable_ns3) include(FindNS3) if (SIMGRID_HAVE_NS3) - if (NS3_VERSION VERSION_LESS "3.28") + if (NOT NS3_VERSION EQUAL "3-dev" AND NS3_VERSION VERSION_LESS "3.28") message(FATAL_ERROR "SimGrid needs at least ns-3.28. Please upgrade or disable that cmake option.") endif() set(SIMGRID_HAVE_NS3 1) @@ -239,6 +239,22 @@ if(enable_ns3) endif() endif() +### Check for Eigen library +set(SIMGRID_HAVE_EIGEN3 0) +find_package (Eigen3 3.3 CONFIG + HINTS ${EIGEN3_HINT}) +if (Eigen3_FOUND) + set(SIMGRID_HAVE_EIGEN3 1) + message(STATUS "Found Eigen3: ${EIGEN3_INCLUDE_DIR}") + include_directories(${EIGEN3_INCLUDE_DIR}) + if ("3.3.4" VERSION_EQUAL EIGEN3_VERSION_STRING AND CMAKE_COMPILER_IS_GNUCC) + message(STATUS "Avoid build error of Eigen3 v3.3.4 using -Wno-error=int-in-bool-context") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=int-in-bool-context") + endif() +else() + message(STATUS "Disabling model BMF because Eigen3 was not found. If it's installed, use EIGEN3_HINT to hint cmake about the location of Eigen3Config.cmake") +endif() + set(SIMGRID_HAVE_MSG 0) if(enable_msg) set(SIMGRID_HAVE_MSG 1) @@ -409,7 +425,7 @@ if(enable_java AND NOT enable_msg) endif() if (enable_model-checking AND enable_ns3) - message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pulls too much dependencies for the MC to work") + message(WARNING "Activating both model-checking and ns-3 bindings is considered experimental.") endif() if(enable_smpi) @@ -540,7 +556,7 @@ file(READ ${CMAKE_HOME_DIRECTORY}/src/smpi/smpitools.sh SMPITOOLS_SH) # Definiti set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") -set(includeflag "-I${includedir} -I${includedir}/smpi") +set(includeflag "\"-I${includedir}\" \"-I${includedir}/smpi\"") set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${libdir}") if(NS3_LIBRARY_PATH) set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}") @@ -568,8 +584,8 @@ endforeach() set(exec_prefix "${CMAKE_BINARY_DIR}/smpi_script/") set(includedir "${CMAKE_HOME_DIRECTORY}/include") set(libdir "${CMAKE_BINARY_DIR}/lib") -set(includeflag "-I${includedir} -I${includedir}/smpi") -set(includeflag "${includeflag} -I${CMAKE_BINARY_DIR}/include -I${CMAKE_BINARY_DIR}/include/smpi") +set(includeflag "\"-I${includedir}\" \"-I${includedir}/smpi\"") +set(includeflag "${includeflag} \"-I${CMAKE_BINARY_DIR}/include\" \"-I${CMAKE_BINARY_DIR}/include/smpi\"") set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${libdir}") if(NS3_LIBRARY_PATH) set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}") @@ -839,6 +855,16 @@ if(enable_python) add_dependencies(tests python-bindings) set_property(TARGET python-bindings APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") + + if("${SIMGRID_PYTHON_LIBDIR}" STREQUAL "") # value not manually set + if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + set(SIMGRID_PYTHON_LIBDIR ${Python3_SITEARCH}) + else("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + string(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" SIMGRID_PYTHON_LIBDIR ${Python3_SITEARCH}) + endif("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + endif() + install(TARGETS python-bindings + LIBRARY DESTINATION "${SIMGRID_PYTHON_LIBDIR}") else() message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).") endif() @@ -943,12 +969,19 @@ endif() if(pybind11_FOUND) message(" Compile Python bindings .....: ${enable_python}") message(" module ....................: ${PYTHON_MODULE_PREFIX}simgrid${PYTHON_MODULE_EXTENSION}") + message(" install path ..............: ${SIMGRID_PYTHON_LIBDIR} (force another value with -DSIMGRID_PYTHON_LIBDIR)") else() message(" Compile Python bindings .....: OFF (disabled, or pybind11 not found)") endif() +if(Eigen3_FOUND) + message(" Eigen3 library ..............: ${EIGEN3_VERSION_STRING} in ${EIGEN3_INCLUDE_DIR}") +else() + message(" Eigen3 library ..............: not found (EIGEN3_HINT='${EIGEN3_HINT}').") +endif() message(" Compile Smpi ................: ${HAVE_SMPI}") message(" Smpi fortran ..............: ${SMPI_FORTRAN}") message(" MPICH3 testsuite ..........: ${enable_smpi_MPICH3_testsuite}") +message(" MBI testsuite .............: ${enable_smpi_MBI_testsuite}") message(" Privatization .............: ${HAVE_PRIVATIZATION}") message(" PAPI support...............: ${HAVE_PAPI}") message(" Compile Boost.Context support: ${HAVE_BOOST_CONTEXTS}")