##
## Check the C/C++ standard that we need
-## See also tools/cmake/GCCFlags.cmake that sets our paranoid warning flags
+## See also tools/cmake/Flags.cmake that sets our paranoid warning flags
INCLUDE(CheckCCompilerFlag)
CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER)
set(SMPI_FLANG 1)
endif()
- set(SMPI_FORTRAN 1 CACHE BOOL "Whether SMPI Fortran code can be compiled")
- mark_as_advanced(SMPI_FORTRAN)
+ set(SMPI_FORTRAN 1)
endif(CMAKE_Fortran_COMPILER)
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "21")
+set(SIMGRID_VERSION_MINOR "22")
set(SIMGRID_VERSION_PATCH "90")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
set(_Boost_STACKTRACE_HEADERS "boost/stacktrace.hpp")
set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
-find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace unit_test_framework)
+find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace)
set(Boost_FOUND 1) # These components are optionals
message(STATUS "Mandatory components found. SimGrid is compilable.")
message(STATUS "Looking for optional Boost components:")
set(HAVE_BOOST_CONTEXTS 0)
endif()
-if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
- message(STATUS " unit_test_framework: found. Activating the Boost-based unit tests.")
-else()
- message(STATUS " unit_test_framework: MISSING. Install libboost-test-dev (>= v1.59) to activate the Unit Tests.")
-endif()
-
# Checks for header libraries functions.
CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME)
CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "" HAVE_PTHREAD_SETAFFINITY)
+CHECK_INCLUDE_FILE("pthread_np.h" HAVE_PTHREAD_NP_H) # for pthread_setaffinity_np() on FreeBSD
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(CMAKE_REQUIRED_DEFINITIONS "-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
## GIT version check
##
if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
- execute_process(
- COMMAND git remote
- COMMAND head -n 1
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
- OUTPUT_VARIABLE remote
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- #message(STATUS "Git remote: ${remote}")
- execute_process(COMMAND git config --get remote.${remote}.url
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
- OUTPUT_VARIABLE url
+ execute_process(COMMAND git rev-parse --verify --short HEAD
+ WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+ OUTPUT_VARIABLE GIT_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
- #message(STATUS "Git url: ${url}")
- if(url)
- execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=oneline --abbrev-commit -1
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
- OUTPUT_VARIABLE GIT_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- message(STATUS "Git version: ${GIT_VERSION}")
-
- execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --pretty=format:%ai .
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
- OUTPUT_VARIABLE GIT_DATE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- message(STATUS "Git date: ${GIT_DATE}")
- string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-
- execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=format:%H -1
- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
- OUTPUT_VARIABLE SIMGRID_GITHASH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ # Check for uncommitted changes
+ execute_process(COMMAND git diff --name-only HEAD
+ WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+ OUTPUT_VARIABLE files_changed)
+ if(files_changed)
+ set(GIT_VERSION "${GIT_VERSION}-dirty")
endif()
elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION)
else()
set(GIT_VERSION "none, release version")
endif()
+message(STATUS "Git version: ${GIT_VERSION}")
-### Setup gcc & clang flags
+### Define source packages for Libs
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
+
+### Setup gcc & clang flags (include after DefinePackage.cmake, and before generating header files)
if (NOT MSVC)
- include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake)
+ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
endif()
### Generate the required headers and scripts
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/config.h)
file(REMOVE ${CMAKE_BINARY_DIR}/src/internal_config.h.generated)
file(REMOVE ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated)
+file(REMOVE ${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated)
# We need two versions of the SMPI scripts because they contain the path to the library
# so, it depends of whether SimGrid is installed, or run from the sources (during the build)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${generated_files_to_clean}")
-### Define source packages for Libs
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
+add_custom_target(tests COMMENT "Recompiling the tests")
### Build some Maintainer files
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
### Make Libs
if(NOT WIN32)
# Python binding (with pybind11)
################
-
# Our usage of pybind11::overload_cast mandates C++14
get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-if ("cxx_std_14" IN_LIST known_features)
- find_package(pybind11 2.2.0)
+
+if("cxx_std_14" IN_LIST known_features)
+
+ if(EXISTS ${CMAKE_HOME_DIRECTORY}/pybind11) # Try to use a local copy of pybind11, if any
+ message(STATUS "Use the internal copy of pybind11 (using C++14).")
+ add_subdirectory(${CMAKE_HOME_DIRECTORY}/pybind11)
+ set(pybind11_FOUND ON)
+
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/pybind11/tools/)
+ set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+ find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
+
+ else()
+ find_package(pybind11 2.2.0)
+ endif()
+
if(NOT PYTHONLIBS_FOUND)
+ message(STATUS "Python libs not found. Turn pybind11 off.")
+
set(pybind11_FOUND OFF)
endif()
+
else()
message(STATUS "No support for C++14 detected, don't even search for pybind11.")
set(pybind11_FOUND OFF)
pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp)
target_compile_features(python-bindings PRIVATE cxx_std_14)
target_link_libraries(python-bindings PUBLIC simgrid)
- set_target_properties(python-bindings PROPERTIES LIBRARY_OUTPUT_NAME simgrid)
+ set_target_properties(python-bindings PROPERTIES
+ LIBRARY_OUTPUT_NAME simgrid
+ CXX_VISIBILITY_PRESET "default")
+ add_dependencies(tests python-bindings)
set_property(TARGET python-bindings
APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
else()