set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "34")
-set(SIMGRID_VERSION_PATCH "0") # odd => git branch; even => stable release or released snapshot
+set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Check for the compiler #
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-##
-## Check the C/C++ standard that we need
-## See also tools/cmake/Flags.cmake that sets our paranoid warning flags
-INCLUDE(CheckCCompilerFlag)
-CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER)
+INCLUDE(CheckCCompilerFlag)
## Request full debugging flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif()
### Check for Eigen library
-set(SIMGRID_HAVE_EIGEN3 OFF)
-find_package (Eigen3 3.3 CONFIG
- HINTS ${EIGEN3_HINT})
-if (Eigen3_FOUND)
- set(SIMGRID_HAVE_EIGEN3 ON)
- 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")
+if ((NOT DEFINED EIGEN3_HINT) OR (NOT EIGEN3_HINT STRLESS_EQUAL "OFF"))
+ set(SIMGRID_HAVE_EIGEN3 OFF)
+ find_package (Eigen3 3.3 CONFIG
+ HINTS ${EIGEN3_HINT})
+ if (Eigen3_FOUND)
+ set(SIMGRID_HAVE_EIGEN3 ON)
+ 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()
+ mark_as_advanced(Eigen3_DIR)
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")
+ message(STATUS "Disabling Eigen3 as requested by the user (EIGEN3_HINT is set to 'OFF')")
endif()
-mark_as_advanced(Eigen3_DIR)
# Check for our JSON dependency
set(SIMGRID_HAVE_JSON 0)
message(FATAL_ERROR "Cannot build without sysconf.")
endif()
CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV)
-CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP)
CHECK_SYMBOL_EXISTS(vasprintf stdio.h HAVE_VASPRINTF)
set(SG_HAVE_SENDFILE 0)
endif()
-if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD")
- message(FATAL_ERROR "Support for model-checking has not been enabled on ${CMAKE_SYSTEM}. Please use a Linux docker to use the model checker.")
-endif()
-
-if(enable_model-checking AND minimal-bindings)
- message(FATAL_ERROR "Compile-time option 'minimal-bindings' cannot be enabled with 'model-checking'")
-endif()
-
if(enable_mallocators)
SET(SIMGRID_HAVE_MALLOCATOR 1)
else()
endif()
SET(SIMGRID_HAVE_MC OFF)
-SET(SIMGRID_HAVE_STATEFUL_MC OFF)
-SET(HAVE_MMALLOC 0)
-
-find_package(Libevent)
-if(Libevent_FOUND)
- message(STATUS "Found libevent. The stateless model-checking can be enabled.")
- include_directories(${LIBEVENT_INCLUDE_DIR})
- set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES}")
- SET(SIMGRID_HAVE_MC ON)
-else()
- message(STATUS "libevent not found. Please install libevent-dev to enable the SimGrid model checker.")
-endif()
-mark_as_advanced(LIBEVENT_LIBRARY)
-mark_as_advanced(LIBEVENT_THREADS_LIBRARY)
if(enable_model-checking)
- include(FindLibunwind)
- find_package(Libdw)
- find_package(Libelf)
- if(HAVE_MMAP AND HAVE_LIBUNWIND AND Libdw_FOUND AND Libelf_FOUND AND Libevent_FOUND)
- message(STATUS "All dependencies found. The stateful model-checking can be enabled.")
- SET(SIMGRID_HAVE_STATEFUL_MC ON)
- SET(HAVE_MMALLOC 1)
- SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}")
- include_directories(${LIBDW_INCLUDE_DIR} ${LIBELF_INCLUDE_DIR})
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gdwarf-4")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gdwarf-4")
+ find_package(Libevent)
+ if(Libevent_FOUND)
+ message(STATUS "Found libevent. The stateless model-checking can be enabled.")
+ include_directories(${LIBEVENT_INCLUDE_DIR})
+ set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES}")
+ SET(SIMGRID_HAVE_MC ON)
else()
- message(STATUS "Please install libunwind-dev libdw-dev libelf-dev libevent-dev to enable the stateful model checker.")
- set(HAVE_MMALLOC 0)
+ message(STATUS "libevent not found. Please install libevent-dev to enable the SimGrid model checker.")
endif()
-endif()
-mark_as_advanced(PATH_LIBDW_H)
-mark_as_advanced(PATH_LIBDW_LIB)
-
-if (SIMGRID_HAVE_STATEFUL_MC AND enable_ns3)
- message(WARNING "Activating both model-checking and ns-3 bindings is considered experimental.")
+ mark_as_advanced(LIBEVENT_LIBRARY)
+ mark_as_advanced(LIBEVENT_THREADS_LIBRARY)
endif()
if(enable_smpi)
add_dependencies(tests tests-mc)
add_custom_target(tests-ns3 COMMENT "Recompiling the ns3 tests and tools.")
add_dependencies(tests tests-ns3)
+add_custom_target(examples COMMENT "Recompiling all examples")
+add_dependencies(examples tests)
### Build some Maintainer files
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
option(enable_python "Whether the Python bindings are activated." ${default_enable_python}) # ON by default if dependencies are met
-if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_model-checking AND enable_python)
- message(WARNING "FreeBSD + Model-Checking + Python = too much for now. Disabling the Python bindings.")
- set(enable_python FALSE)
-endif()
-
if(enable_python)
if(NOT Python3_Development_FOUND)
message(FATAL_ERROR "Please install the development components of Python (python3-dev on Debian) to build the Python bindings (or disable that option).")
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(" MPICH3 testsuite ..........: ${enable_testsuite_smpi_MPICH3}")
+message(" MBI testsuite .............: ${enable_testsuite_smpi_MBI}")
message(" Privatization .............: ${HAVE_PRIVATIZATION}")
message(" PAPI support ..............: ${HAVE_PAPI}")
message(" Compile Boost.Context support: ${HAVE_BOOST_CONTEXTS}")
message("")
message(" Model checking ..............: ${SIMGRID_HAVE_MC}")
-message(" Stateful model checking ...: ${SIMGRID_HAVE_STATEFUL_MC}")
-message(" MBI testsuite .............: ${enable_smpi_MBI_testsuite}")
+message(" MBI testsuite .............: ${enable_testsuite_smpi_MBI}")
+message(" McMini testsuite ..........: ${enable_testsuite_McMini}")
message("")
message(" Maintainer mode .............: ${enable_maintainer_mode}")
message(" Documentation ...............: ${enable_documentation}")
file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build "GIT version : ${GIT_VERSION}\n")
file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Release : simgrid-${release_version}\n")
-INCLUDE(Dart)