X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d882f311a5e8d59afe8c26d2b5025fa45ab713ae..a96bfe1ee8deb9d1e994e78c4be07b0e3cdb7149:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c0e04c4c1..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,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 @@ -179,12 +179,12 @@ include(CMakeDetermineSystem) IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64") 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.") @@ -192,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) @@ -230,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() @@ -249,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) @@ -375,7 +381,7 @@ if(HAVE_LIBUNWIND) 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(PROCESSOR_x86_64) + if(SIMGRID_PROCESSOR_x86_64) SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64") else() SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86") @@ -393,6 +399,10 @@ if(enable_model-checking) 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) @@ -404,7 +414,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() @@ -650,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 HAVE_MREMAP HAVE_DLFUNC) - 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)