X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11644e1a44c3ff95e0fbd27e63e654ca647b30e8..25c2dae2d09c5af0cf8459f83fda6bf5f083ce8c:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index fc13ea5c7d..70b1bf2a1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,9 +89,9 @@ endif() #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "13") -set(SIMGRID_VERSION_PATCH "90") -set(SIMGRID_VERSION_EXTRA "-prealpha") # Extra words to add to version string (e.g. -rc1) +set(SIMGRID_VERSION_MINOR "15") +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 @@ -116,12 +116,12 @@ 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 if("${CMAKE_SYSTEM}" MATCHES "Linux") - find_library(dl DL_LIBRARY) + find_library(DL_LIBRARY dl) endif("${CMAKE_SYSTEM}" MATCHES "Linux") ### Find programs and paths @@ -159,13 +159,6 @@ if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/) set(INCLUDES ${INCLUDES} /usr/include/) endif() -### Check 32bits or 64bits -IF(CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(ARCH_32_BITS 1) -ELSE() - SET(ARCH_32_BITS 0) -ENDIF() - if(WIN32) set(CMAKE_INCLUDE_WIN "${CMAKE_C_COMPILER}") set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}") @@ -177,20 +170,21 @@ endif() include_directories(${INCLUDES}) - +# library dependency cannot start with a space (CMP0004), so initialize it with something that is never desactivated. +set(SIMGRID_DEP "-lm") ### Determine the assembly flavor that we need today set(HAVE_RAW_CONTEXTS 0) include(CMakeDetermineSystem) IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64") - IF(${ARCH_32_BITS}) + IF(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits message(STATUS "System processor: i686 (${CMAKE_SYSTEM_PROCESSOR}, 32 bits)") - set(PROCESSOR_i686 1) - set(PROCESSOR_x86_64 0) + set(SIMGRID_PROCESSOR_i686 1) + set(SIMGRID_PROCESSOR_x86_64 0) ELSE() message(STATUS "System processor: x86_64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)") - set(PROCESSOR_i686 0) - set(PROCESSOR_x86_64 1) + set(SIMGRID_PROCESSOR_i686 0) + set(SIMGRID_PROCESSOR_x86_64 1) ENDIF() if (WIN32) message(STATUS "Disable fast raw contexts on Windows.") @@ -198,8 +192,8 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64") set(HAVE_RAW_CONTEXTS 1) endif() ELSE() - set(PROCESSOR_i686 0) - set(PROCESSOR_x86_64 0) + set(SIMGRID_PROCESSOR_i686 0) + set(SIMGRID_PROCESSOR_x86_64 0) ENDIF() include(CheckFunctionExists) @@ -236,17 +230,23 @@ if(enable_smpi_papi) endif() endif() +# Not finding this is perfectly OK +find_package(Boost COMPONENTS unit_test_framework) +if (Boost_UNIT_TEST_FRAMEWORK_FOUND) + message("-- (enabling the Boost-based unit tests)") +else() + message("-- (disabling the Boost-based unit tests -- please install libboost-test-dev)") +endif() + + find_package(Boost 1.48) if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIRS}) else() if(APPLE) - message(FATAL_ERROR "Failed to find Boost libraries (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'") else() - message(FATAL_ERROR "Failed to find Boost libraries." - "Did you install libboost-dev and libboost-context-dev?" - "(libboost-context-dev is optional)" - "SimGrid requires Boost >= 1.48.0") + message(FATAL_ERROR "Boost libraries not found. Install libboost-dev (>= 1.48.0).") endif() endif() @@ -255,7 +255,7 @@ endif() 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.") + 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) @@ -280,18 +280,6 @@ else() endif() endif() -# Try again to see if we have libboost-graph -#find_package(Boost 1.42 COMPONENTS graph) -#set(Boost_FOUND 1) # We don't care of whether this component is missing -# -#if(Boost_FOUND AND Boost_GRAPH_FOUND) -# set(HAVE_BOOST_GRAPH 1) -#else() -# message (" boost : found.") -# message (" boost-graph : missing. Install libboost-graph-dev for this optional feature.") -# set(HAVE_BOOST_GRAPH 0) -#endif() - # Checks for header libraries functions. CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME) @@ -323,6 +311,7 @@ CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H) CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H) CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) +CHECK_FUNCTION_EXISTS(dlfunc HAVE_DLFUNC) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP) CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) @@ -352,10 +341,19 @@ else() set(HAVE_THREAD_LOCAL_STORAGE 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) +endif() + if(HAVE_MMAP AND HAVE_THREAD_LOCAL_STORAGE) SET(HAVE_MMALLOC 1) else() SET(HAVE_MMALLOC 0) + if(enable_model-checking) + message(STATUS "Warning: support for model-checking has been disabled because you are missing either mmap or __thread.") + endif() + SET(enable_model-checking 0) endif() if(enable_jedule) @@ -370,21 +368,44 @@ else() SET(HAVE_MALLOCATOR 0) endif() -if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux") - message(WARNING "Support for model-checking has not been enabled on ${CMAKE_SYSTEM}: disabling it") - set(enable_model-checking FALSE) - set(HAVE_MC 0) -endif() -if(enable_model-checking AND HAVE_MMALLOC) - SET(HAVE_MC 1) - include(FindLibunwind) - include(FindLibdw) +include(FindLibunwind) +if(HAVE_LIBUNWIND) + if(NOT APPLE) + SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind") + else() + # Apple forbids to link directly against its libunwind implementation + # So let's comply and link against the System framework + SET(SIMGRID_DEP "${SIMGRID_DEP} -lSystem") + endif() + if("${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD") + set(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-ptrace") + # This supposes that the host machine is either an AMD or a X86. + # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME) + if(SIMGRID_PROCESSOR_x86_64) + SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64") + else() + SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86") + endif() + endif() else() if(enable_model-checking) - message(STATUS "Warning: support for model-checking has been disabled because you are missing either mmap or __thread.") + message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.") endif() - SET(HAVE_MC 0) - SET(HAVE_MMALLOC 0) +endif() + +if(enable_model-checking) + find_package(Libdw REQUIRED) + find_package(Libevent REQUIRED) + include_directories(${LIBDW_INCLUDE_DIRS} ${LIBEVENT_INCLUDE_DIRS}) + set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBDW_LIBRARIES}") + set(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(HAVE_MMALLOC 0) endif() if (enable_model-checking AND enable_ns3) @@ -393,12 +414,9 @@ endif() if(enable_smpi) SET(HAVE_SMPI 1) - if("${CMAKE_SYSTEM}" MATCHES "Linux") + if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux") SET(USE_LIBUTIL 0) SET(HAVE_PRIVATIZATION 1) - elseif("${CMAKE_SYSTEM}" MATCHES "^FreeBSD") - SET(USE_LIBUTIL 0) - SET(HAVE_PRIVATIZATION 0) else() message (STATUS "Warning: no support for SMPI automatic privatization on this platform") SET(HAVE_PRIVATIZATION 0) @@ -642,27 +660,13 @@ if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/) endif() elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion) FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION) +else() + set(GIT_VERSION "none, release version") endif() ### Generate the required headers and scripts ############################################# -# gcc makes no difference between "#define HAVE_FOOBAR" and "#define HAVE_FOOBAR 0" by default, -# but this too error prone. If you forget to include the config.h, you get weird segfaults. -# If you include it everywhere, everything gets recompiled everytime. -# So we include only where needed, and compile with -Wundef to notice the missing includes. -# But cmake sometimes defines to the empty definition (#define HAVE_VALGRIND_H). -# So we have to make sure that everything got a decent value before generating the files. -foreach(var HAVE_BACKTRACE HAVE_EXECINFO_H HAVE_FUTEX_H HAVE_GETDTABLESIZE HAVE_GETTIMEOFDAY HAVE_MMAP HAVE_NANOSLEEP HAVE_POPEN - HAVE_POSIX_GETTIME HAVE_PROCESS_VM_READV HAVE_SIGNAL_H HAVE_SYS_PARAM_H HAVE_SYS_SYSCTL_H HAVE_SYSCONF - HAVE_UCONTEXT_H HAVE_UNISTD_H HAVE_VALGRIND_H HAVE_VASPRINTF) - if(${var}) - set(${var} 1) - else() - set(${var} 0) - endif() -endforeach() - # Avoid triggering a (full) rebuild by touching the files if they did not really change configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h.generated" @ONLY IMMEDIATE) configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid_config.h.generated" @ONLY IMMEDIATE)