X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/feed6cf0d74e30e26008916618172e2afba5a378..1c8e95bf8d59453e2aead5f965e3db907361da1d:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 62b507d507..d99da0de15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,11 +89,11 @@ endif() #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "15") +set(SIMGRID_VERSION_MINOR "16") set(SIMGRID_VERSION_PATCH "0") set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1) -set(SIMGRID_VERSION_DATE "2016") # Year for copyright information +set(SIMGRID_VERSION_DATE "2017") # Year for copyright information if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") @@ -116,7 +116,7 @@ else() set(LIB_EXE "so") endif() -execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION) +execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION ERROR_VARIABLE LINKER_VERSION) string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}") ### Set the library providing dlopen @@ -206,15 +206,17 @@ include(CheckSymbolExists) set(HAVE_GRAPHVIZ 0) include(FindGraphviz) -set(HAVE_LUA 0) +set(SIMGRID_HAVE_LUA 0) if(enable_lua) include(FindLuaSimgrid) endif() -set(HAVE_NS3 0) +set(SIMGRID_HAVE_NS3 0) if(enable_ns3) include(FindNS3) - if (NOT HAVE_NS3) + if (SIMGRID_HAVE_NS3) + set(SIMGRID_HAVE_NS3 1) + else() message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option") endif() endif() @@ -244,40 +246,29 @@ if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIRS}) else() if(APPLE) - message(FATAL_ERROR "Boost libraries not found. Try to install them with 'sudo fink install boost1.53.nopython'") + message(FATAL_ERROR "Boost libraries not found. Try to install them with 'sudo fink install boost1.53.nopython' (check the exact name with 'fink list boost') or 'sudo brew install boost'") else() message(FATAL_ERROR "Boost libraries not found. Install libboost-dev (>= 1.48.0).") endif() endif() -#Boost context 1.61 will break compatibility with our implementation. -#Warn users about that -find_package(Boost 1.61 COMPONENTS context) - -if(Boost_FOUND AND Boost_CONTEXT_FOUND) - message(" WARNING : our implementation of Boost context factory is not compatible with Boost >=1.61 yet.") - - set(Boost_FOUND 1) - set(HAVE_BOOST_CONTEXTS 0) -else() -# Try again to see if we have libboost-context - find_package(Boost 1.42 COMPONENTS context) - set(Boost_FOUND 1) # We don't care of whether this component is missing - - if(Boost_FOUND AND Boost_CONTEXT_FOUND) - # We should use feature detection for this instead: - if (Boost_VERSION LESS 105600) - message("Found Boost.Context API v1") - set(HAVE_BOOST_CONTEXTS 1) - else() - message("Found Boost.Context API v2") - set(HAVE_BOOST_CONTEXTS 2) - endif() +find_package(Boost COMPONENTS context) +set(Boost_FOUND 1) # This component is optional +if(Boost_CONTEXT_FOUND) + if (Boost_VERSION LESS 105600) + message("Found Boost.Context API v1") + set(HAVE_BOOST_CONTEXTS 1) + elseif(Boost_VERSION LESS 106100) + message("Found Boost.Context API v2") + set(HAVE_BOOST_CONTEXTS 2) else() - message (" boost : found.") - message (" boost-context: missing. Install libboost-context-dev for this optional feature.") + message(" WARNING : our implementation of Boost context factory is not compatible with Boost >=1.61 yet.") set(HAVE_BOOST_CONTEXTS 0) endif() +else() + message (" boost : found.") + message (" boost-context: missing. Install libboost-context-dev for this optional feature.") + set(HAVE_BOOST_CONTEXTS 0) endif() # Checks for header libraries functions. @@ -341,6 +332,14 @@ else() set(HAVE_THREAD_LOCAL_STORAGE 0) endif() +CHECK_INCLUDE_FILE("sys/sendfile.h" HAVE_SENDFILE_H) +CHECK_FUNCTION_EXISTS(sendfile HAVE_SENDFILE) +if(HAVE_SENDFILE_H AND HAVE_SENDFILE) + set(HAVE_SENDFILE 1) +else() + set(HAVE_SENDFILE 0) +endif() + if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD") message(WARNING "Support for model-checking has not been enabled on ${CMAKE_SYSTEM}: disabling it") set(enable_model-checking FALSE) @@ -357,15 +356,15 @@ else() endif() if(enable_jedule) - set(HAVE_JEDULE 1) + set(SIMGRID_HAVE_JEDULE 1) else() - set(HAVE_JEDULE 0) + set(SIMGRID_HAVE_JEDULE 0) endif() if(enable_mallocators) - SET(HAVE_MALLOCATOR 1) + SET(SIMGRID_HAVE_MALLOCATOR 1) else() - SET(HAVE_MALLOCATOR 0) + SET(SIMGRID_HAVE_MALLOCATOR 0) endif() include(FindLibunwind) @@ -396,15 +395,15 @@ endif() if(enable_model-checking) find_package(Libdw REQUIRED) find_package(Libevent REQUIRED) - include_directories(${LIBDW_INCLUDE_DIRS} ${LIBEVENT_INCLUDE_DIRS}) + include_directories(${LIBDW_INCLUDE_DIR} ${LIBEVENT_INCLUDE_DIR}) set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBDW_LIBRARIES}") - set(HAVE_MC 1) + set(SIMGRID_HAVE_MC 1) if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_java) message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling java") set(enable_java FALSE) endif() else() - SET(HAVE_MC 0) + SET(SIMGRID_HAVE_MC 0) set(HAVE_MMALLOC 0) endif() @@ -414,7 +413,7 @@ endif() if(enable_smpi) SET(HAVE_SMPI 1) - if("${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD") + if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux") SET(USE_LIBUTIL 0) SET(HAVE_PRIVATIZATION 1) else() @@ -690,6 +689,7 @@ if(NS3_LIBRARY_PATH) set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}") endif() set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"") +set(SMPIMAIN smpimain) configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/mpif.h @ONLY) foreach(script cc cxx ff f90 run) @@ -707,6 +707,7 @@ if(NS3_LIBRARY_PATH) set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}") endif() set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"") +set(SMPIMAIN ${CMAKE_BINARY_DIR}/bin/smpimain) foreach(script cc cxx ff f90 run) configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpi${script}.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpi${script} @ONLY) @@ -953,7 +954,7 @@ message(" LDFlags .....................: ${CMAKE_C_LINK_FLAGS}") message(" with LTO ....................: ${enable_lto}") message("") -if (HAVE_NS3) +if (SIMGRID_HAVE_NS3) message(" Compile NS-3 ................: yes (path: ${NS3_PATH})") else() message(" Compile NS-3 ................: NO (hint: ${NS3_HINT})") @@ -965,7 +966,7 @@ if (${Java_FOUND}) else() message(" Compile Java ................: NO") endif() -message(" Compile Lua .................: ${HAVE_LUA}") +message(" Compile Lua .................: ${SIMGRID_HAVE_LUA}") message(" Compile Smpi ................: ${HAVE_SMPI}") message(" Smpi fortran ..............: ${SMPI_FORTRAN}") message(" MPICH3 testsuite ..........: ${enable_smpi_MPICH3_testsuite}") @@ -975,8 +976,8 @@ message(" Compile Boost.Context support: ${HAVE_BOOST_CONTEXTS}") message("") message(" Maintainer mode .............: ${enable_maintainer_mode}") message(" Documentation................: ${enable_documentation}") -message(" Model checking ..............: ${HAVE_MC}") -message(" Jedule mode ................: ${HAVE_JEDULE}") +message(" Model checking ..............: ${SIMGRID_HAVE_MC}") +message(" Jedule mode ................: ${SIMGRID_HAVE_JEDULE}") message(" Graphviz mode ...............: ${HAVE_GRAPHVIZ}") message(" Mallocators .................: ${enable_mallocators}") message("")