X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5fdc0f90b4c3ec53803150b783320e9cd4ebc75..1957cbeaedc9d28cea7839684d82ac8454cc8bef:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index aa8cfedce4..e2bb276f16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,40 +60,44 @@ if(APPLE AND (CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6")) set(HAVE_UCONTEXT_H 0) endif() +### Check threading support +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +find_package(Threads) ### Setup Options include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake) ### SMPI vs. Fortran if ((NOT DEFINED enable_smpi) OR enable_smpi) + # First unset the compiler in case we're re-running cmake over a previous + # configuration where it was saved as smpiff + unset(CMAKE_Fortran_COMPILER) + + SET(SMPI_FORTRAN 0) if(enable_fortran) - include(FindGFortran) - else() - SET(SMPI_FORTRAN 0) + enable_language(Fortran OPTIONAL) endif() - if(NOT APPLE) # smpi is enabled by default - # Call enable_language(Fortran) in order to load the build rules for this language, needed by - # teshsuite/smpi/mpich-test/. Use CMAKE_FORCE_Fortran_COMPILER to bypass checks for a working compiler (smpiff - # doesn't exist at configure time). - include(CMakeForceCompiler) - if(NOT COMMAND CMAKE_FORCE_Fortran_COMPILER) - MACRO(CMAKE_FORCE_Fortran_COMPILER compiler id) - SET(CMAKE_Fortran_COMPILER "${compiler}") - SET(CMAKE_Fortran_COMPILER_ID_RUN TRUE) - SET(CMAKE_Fortran_COMPILER_ID ${id}) - SET(CMAKE_Fortran_COMPILER_WORKS TRUE) - SET(CMAKE_Fortran_COMPILER_FORCED TRUE) - - # Set old compiler id variables. - IF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") - SET(CMAKE_COMPILER_IS_GNUG77 1) - ENDIF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") - ENDMACRO(CMAKE_FORCE_Fortran_COMPILER) + 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") + set(SMPI_Fortran_FLAGS "\"-fpic\" \"-ff2c\" \"-fno-second-underscore\"") + set(SMPI_Fortran_LIBS "\"-lgfortran\"") + 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 + set(SMPI_Fortran_FLAGS "\"-fPIC\"") + set(SMPI_Fortran_LIBS "") endif() - CMAKE_FORCE_Fortran_COMPILER(smpiff smpiff) - enable_language(Fortran OPTIONAL) - endif() + + set(SMPI_FORTRAN 1) + endif(CMAKE_Fortran_COMPILER) + endif() #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# @@ -101,11 +105,11 @@ 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 "17") +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}") @@ -119,20 +123,23 @@ set(libsimgrid_version "${release_version}") set(libsimgrid-java_version "${release_version}") ### SET THE LIBRARY EXTENSION -if(APPLE) #MAC +if(APPLE) set(LIB_EXE "dylib") +elseif(WIN32) + set(LIB_EXE "a") + set(BIN_EXE ".exe") else() - if(WIN32) #WINDOWS - set(LIB_EXE "a") - set(BIN_EXE ".exe") - else() #UNIX - set(LIB_EXE "so") - endif() + 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_LIBRARY dl) +endif("${CMAKE_SYSTEM}" MATCHES "Linux") + ### Find programs and paths FIND_PROGRAM(GCOV_PATH gcov) include(FindPerl) @@ -140,32 +147,34 @@ if(NOT PERL_FOUND) message(FATAL_ERROR "Please install Perl to compile SimGrid.") endif() -if (APPLE) - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +# tesh.py needs python 3 (or the module python-subprocess32 on python2.8+) +set(PythonInterp_FIND_VERSION 3) +set(PythonInterp_FIND_VERSION_COUNT 1) +set(PythonInterp_FIND_VERSION_MAJOR 3) +include(FindPythonInterp) +if(NOT PYTHONINTERP_FOUND) + message(FATAL_ERROR "Please install Python (version 3 or higher).") endif() + SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) ### Compute the include paths set(INCLUDES + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/include ) +if(enable_smpi) + set (INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include) +endif() + 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,29 +186,32 @@ 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.") + elseif(enable_address_sanitizer) + message("Disable fast raw contexts with ASan") else() 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) @@ -212,15 +224,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() @@ -236,67 +250,43 @@ 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' (check the exact name with 'fink list boost') or 'sudo brew install boost'") 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() -#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) +find_package(Boost COMPONENTS context) +set(Boost_FOUND 1) # This component is optional +if(Boost_CONTEXT_FOUND) + message("Found Boost.Context") + set(HAVE_BOOST_CONTEXTS 1) 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() - else() - message (" boost : found.") - message (" boost-context: missing. Install libboost-context-dev for this optional feature.") - set(HAVE_BOOST_CONTEXTS 0) - endif() + message (" boost : found.") + message (" boost-context: missing. Install libboost-context-dev for this optional feature.") + set(HAVE_BOOST_CONTEXTS 0) 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) -CHECK_LIBRARY_EXISTS(pthread pthread_create "" HAVE_PTHREAD) -CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB) +if(NOT APPLE) # OS X El Capitan deprecates this function + CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB) +endif() CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB) set(HAVE_PTHREAD_SETAFFINITY 0) CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "" HAVE_PTHREAD_SETAFFINITY) @@ -321,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) @@ -328,6 +319,7 @@ CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF) CHECK_FUNCTION_EXISTS(popen HAVE_POPEN) CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV) CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP) +CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP) CHECK_SYMBOL_EXISTS(vasprintf stdio.h HAVE_VASPRINTF) if(MINGW) @@ -349,44 +341,80 @@ else() set(HAVE_THREAD_LOCAL_STORAGE 0) endif() -# Our usage of mmap is Linux-specific (flag MAP_ANONYMOUS), but kFreeBSD uses a GNU libc -IF(HAVE_MMAP AND - NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND - NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND - NOT "${CMAKE_SYSTEM}" MATCHES "GNU" AND - NOT "${CMAKE_SYSTEM}" MATCHES "Darwin") - SET(HAVE_MMAP 0) - message(STATUS "Warning: MMAP is thought as non functional on this architecture (${CMAKE_SYSTEM})") -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) +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) - 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() -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 install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.") endif() - SET(HAVE_MC 0) - SET(HAVE_MMALLOC 0) +endif() + +if(enable_model-checking) + find_package(Libdw REQUIRED) + find_package(Libelf REQUIRED) + find_package(Libevent REQUIRED) + include_directories(${LIBDW_INCLUDE_DIR} ${LIBELF_INCLUDE_DIR} ${LIBEVENT_INCLUDE_DIR}) + set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}") + 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(SIMGRID_HAVE_MC 0) + set(HAVE_MMALLOC 0) endif() if (enable_model-checking AND enable_ns3) @@ -395,12 +423,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) @@ -413,7 +438,7 @@ endif() ### Check for GNU dynamic linker CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) if (HAVE_DLFCN_H) - execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_gnu_dynlinker.c -ldl -o test_gnu_ld + execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_gnu_dynlinker.c ${DL_LIBRARY} -o test_gnu_ld WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE HAVE_GNU_LD_compil ) @@ -445,7 +470,7 @@ endif() ### Initialize of CONTEXT THREADS set(HAVE_THREAD_CONTEXTS 0) -if(HAVE_PTHREAD) +if(CMAKE_USE_PTHREADS_INIT) ### Test that we have a way to create semaphores if(HAVE_SEM_OPEN_LIB) @@ -530,6 +555,8 @@ if(HAVE_PTHREAD) endif() endif() file(REMOVE sem_init) + else() + set(HAVE_SEM_INIT 0) endif() if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) @@ -546,6 +573,8 @@ if(NOT HAVE_UCONTEXT_H) elseif(APPLE) message("-- No ucontext factory: Apple don't want us to use them.") set(HAVE_UCONTEXT_H 0) +elseif(enable_address_sanitizer) + message("-- 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) @@ -642,27 +671,18 @@ 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() + +### Setup gcc & clang flags +if (NOT MSVC) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake) 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) @@ -686,6 +706,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) @@ -703,6 +724,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) @@ -849,11 +871,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) @@ -884,21 +901,8 @@ endforeach() ### Setup the distrib include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake) -### Build the doc (Windows downloads the doc instead of regenerating) -# -if(NOT WIN32) - include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Documentation.cmake) -else() - find_program(WGET_PROGRAM NAMES wget) - message(STATUS "wget: ${WGET_PROGRAM}") - if(WGET_PROGRAM) - ADD_CUSTOM_TARGET(documentation - COMMENT "Downloading the SimGrid documentation..." - COMMAND ${WGET_PROGRAM} -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/ - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html - ) - endif() -endif() +### Build the docs if asked to +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Documentation.cmake) ### Print the result of configuration message("") @@ -942,14 +946,9 @@ message(" version .............: ${CMAKE_CXX_COMPILER_VERSION}") if(${Java_FOUND}) message(" Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}") message(" version .............: ${Java_VERSION_STRING}") -if(${SWIG_FOUND}) - message(" SWIG ................: Version ${SWIG_VERSION} found.") -else() - message(" SWIG ................: Missing.") -endif() endif() if(CMAKE_Fortran_COMPILER) - message(" Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (id: ${CMAKE_Fortran_COMPILER_ID})") + message(" Compiler: Fortran ...........: ${SMPI_Fortran_COMPILER} (id: ${CMAKE_Fortran_COMPILER_ID})") message(" version .............: ${CMAKE_Fortran_COMPILER_VERSION}") endif() message(" Linker: .....................: ${CMAKE_LINKER}") @@ -962,7 +961,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})") @@ -974,7 +973,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}") @@ -984,8 +983,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("")