X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1826898309e6fdd09b8704fd598aa36037a46857..2cf5dfabe75d699461e7b5bd11a6af0ca4b3e55f:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 40d0e0bd4e..3733e2bd18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ if(COMPILER_SUPPORTS_CXX11) else() message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} (v${CMAKE_CXX_COMPILER_VERSION}) has no C++11 support. " - "Please use a decent C++ compiler.") + "Please install a decent C++ compiler (remove CMakeCache.txt once it's installed).") endif() ### And we need C11 standard, too @@ -79,9 +79,9 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi) endif() if(CMAKE_Fortran_COMPILER) + # Fortran compiler detected: save it, then replace by smpiff set(SMPI_Fortran_COMPILER "${CMAKE_Fortran_COMPILER}" CACHE FILEPATH "The real Fortran compiler") - set(CMAKE_Fortran_COMPILER smpiff) # Set flags/libs to be used in smpiff if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU") @@ -90,7 +90,7 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi) elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel") set(SMPI_Fortran_FLAGS "\"-fPIC\" \"-nofor-main\"") set(SMPI_Fortran_LIBS "\"-lifcore\"") - elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI") # flang + elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI|Flang") # flang set(SMPI_Fortran_FLAGS "\"-fPIC\"") set(SMPI_Fortran_LIBS "") endif() @@ -105,11 +105,11 @@ endif() #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "17") -set(SIMGRID_VERSION_PATCH "0") +set(SIMGRID_VERSION_MINOR "19") +set(SIMGRID_VERSION_PATCH "90") set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1) -set(SIMGRID_VERSION_DATE "2017") # Year for copyright information +set(SIMGRID_VERSION_DATE "2018") # Year for copyright information if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") @@ -159,20 +159,26 @@ endif() SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) ### Compute the include paths -set(INCLUDES + +# Only include public headers by default +include_directories( + ${CMAKE_BINARY_DIR}/include + ${CMAKE_HOME_DIRECTORY}/include +) + +# Compute the ones that should be added when compiling the library +set(INTERNAL_INCLUDES ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/include ${CMAKE_HOME_DIRECTORY} - ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include ) if(enable_smpi) - set (INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include) + set (INTERNAL_INCLUDES ${INTERNAL_INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include) endif() if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/) - set(INCLUDES ${INCLUDES} /usr/include/) + set(INTERNAL_INCLUDES ${INTERNAL_INCLUDES} /usr/include/) endif() if(WIN32) @@ -180,12 +186,10 @@ if(WIN32) set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}") string(REGEX REPLACE "/bin/gcc.*" "/include" CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}") string(REGEX REPLACE "/bin/gcc.*" "/lib" CMAKE_LIB_WIN "${CMAKE_LIB_WIN}") - set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN}) + set(INTERNAL_INCLUDES ${INTERNAL_INCLUDES} ${CMAKE_INCLUDE_WIN}) unset(CMAKE_INCLUDE_WIN) 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") @@ -204,6 +208,8 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64") ENDIF() if (WIN32) message(STATUS "Disable fast raw contexts on Windows.") + elseif(enable_address_sanitizer) + message(STATUS "Disable fast raw contexts with ASan") else() set(HAVE_RAW_CONTEXTS 1) endif() @@ -232,6 +238,9 @@ if(enable_ns3) include(FindNS3) if (SIMGRID_HAVE_NS3) set(SIMGRID_HAVE_NS3 1) + foreach(lib core csma point-to-point internet network applications) + set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}") + endforeach() else() message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option") endif() @@ -240,6 +249,7 @@ endif() if(WIN32) set(Boost_USE_STATIC_LIBS 1) endif() + set(HAVE_PAPI 0) if(enable_smpi_papi) include(FindPAPI) @@ -251,9 +261,9 @@ 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)") + message(STATUS "Enabling the Boost-based unit tests.") else() - message("-- (disabling the Boost-based unit tests -- please install libboost-test-dev)") + message(STATUS "Disabling the Boost-based unit tests -- please install libboost-test-dev.") endif() @@ -271,16 +281,8 @@ 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(" WARNING : our implementation of Boost context factory is not compatible with Boost >=1.61 yet.") - set(HAVE_BOOST_CONTEXTS 0) - endif() + message(STATUS "Found Boost.Context") + set(HAVE_BOOST_CONTEXTS 1) else() message (" boost : found.") message (" boost-context: missing. Install libboost-context-dev for this optional feature.") @@ -384,23 +386,7 @@ endif() 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() + SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES}") else() if(enable_model-checking) message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.") @@ -422,6 +408,8 @@ else() SET(SIMGRID_HAVE_MC 0) set(HAVE_MMALLOC 0) endif() +mark_as_advanced(PATH_LIBDW_H) +mark_as_advanced(PATH_LIBDW_LIB) if (enable_model-checking AND enable_ns3) message(FATAL_ERROR "Cannot activate both model-checking and NS3 bindings: NS3 pull too much dependencies for the MC to work") @@ -570,15 +558,17 @@ if(CMAKE_USE_PTHREADS_INIT) endif() set(HAVE_THREAD_CONTEXTS 1) - message("-- Support for thread context factory ok.") + message(STATUS "Support for thread context factory ok.") endif() set(HAVE_UCONTEXT_CONTEXTS 0) if(NOT HAVE_UCONTEXT_H) - message("-- No ucontext factory: not found.") + message(STATUS "No ucontext factory: not found.") elseif(APPLE) - message("-- No ucontext factory: Apple don't want us to use them.") + message(STATUS "No ucontext factory: Apple don't want us to use them.") set(HAVE_UCONTEXT_H 0) +elseif(enable_address_sanitizer) + message(STATUS "No ucontext factory: ASan does not support it (see http://code.google.com/p/address-sanitizer/issues/detail?id=189)") else() try_compile(compile_makecontext ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_makecontext.c OUTPUT_VARIABLE compile_makecontext_output) @@ -586,10 +576,10 @@ else() #If can have both context if(compile_makecontext) set(HAVE_UCONTEXT_CONTEXTS 1) - message("-- Support for ucontext factory ok.") + message(STATUS "Support for ucontext factory ok.") else() - message("-- Error: exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}") - message("-- No ucontext factory: makecontext() is not compilable.") + message(STATUS "Error: exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}") + message(STATUS "No ucontext factory: makecontext() is not compilable.") endif() # Stack setup (size and address) @@ -679,6 +669,11 @@ else() set(GIT_VERSION "none, release version") endif() +### Setup gcc & clang flags +if (NOT MSVC) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake) +endif() + ### Generate the required headers and scripts ############################################# @@ -708,6 +703,16 @@ set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_P set(SMPIMAIN smpimain) configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/mpif.h @ONLY) +#configure mpif.f90 to build mpi.mod +if(SMPI_FORTRAN) + set(MODULE_MPIF_IN "module mpi") + set(MODULE_MPIF_OUT "end module mpi") + configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90.generated @ONLY) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90.generated ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90) + set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/include/smpi) + add_library(mpi SHARED ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90) +endif() + foreach(script cc cxx ff f90 run) configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpi${script}.in ${CMAKE_BINARY_DIR}/bin/smpi${script} @ONLY) endforeach() @@ -770,6 +775,8 @@ if(NOT "${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_gather.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_gather.txt COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_allgatherv.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_allgatherv.txt COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile COPYONLY) + configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_cluster ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_cluster COPYONLY) + configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_coll ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_coll COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/description_file ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple/description_file COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/README ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple/README COPYONLY) @@ -870,11 +877,6 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake) -### Setup gcc & clang flags -if (NOT MSVC) - include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake) -endif() - ### Make Libs if(NOT WIN32) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake)