X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c529a2898e4b141aa20eaf1561ff8afb5e0cc259..06cc5b34eccf67f299861b27a1a367b079fc8d3d:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 545eaaa0a6..6225d9aae8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,7 +101,7 @@ set(SIMGRID_VERSION_MINOR "13") set(SIMGRID_VERSION_PATCH "0") set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1) -set(SIMGRID_VERSION_DATE "2015") # Year for copyright information +set(SIMGRID_VERSION_DATE "2016") # Year for copyright information if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") @@ -182,15 +182,6 @@ if(WIN32) set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN}) unset(CMAKE_INCLUDE_WIN) - find_program(NSIS_PROGRAM NAMES makensi) - set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432}) - if(NSIS_WIN_VERSION MATCHES "") - set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE}) - endif() - if(${NSIS_WIN_VERSION}) - string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION) - endif() - set(_XBT_WIN32 1) message(STATUS "C_COMPILER ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_VERSION}") @@ -223,7 +214,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64") if (MSVC) message(STATUS "Disable fast raw contextes on Microsoft Visual.") else() - set(HAVE_RAWCTX 1) + set(HAVE_RAW_CONTEXTS 1) endif() ENDIF() @@ -276,27 +267,30 @@ 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_CONTEXT 1) + set(HAVE_BOOST_CONTEXTS 1) else() message("Found Boost.Context API v2") - set(HAVE_BOOST_CONTEXT 2) + 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_CONTEXT 0) + set(HAVE_BOOST_CONTEXTS 0) endif() # Checks for header libraries functions. CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_DLOPEN_IN_LIBDL) CHECK_LIBRARY_EXISTS(execinfo backtrace "" HAVE_BACKTRACE_IN_LIBEXECINFO) -CHECK_LIBRARY_EXISTS(pthread pthread_create "" HAVE_PTHREAD) -CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB) -CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB) -CHECK_LIBRARY_EXISTS(pthread sem_timedwait "" HAVE_SEM_TIMEDWAIT_LIB) -CHECK_LIBRARY_EXISTS(pthread pthread_mutex_timedlock "" HAVE_MUTEX_TIMEDLOCK_LIB) CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME) +if(NOT WIN32) # We don't want to have winpthread-1.dll in the jarfile + CHECK_LIBRARY_EXISTS(pthread pthread_create "" HAVE_PTHREAD) + CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB) + CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB) + CHECK_LIBRARY_EXISTS(pthread sem_timedwait "" HAVE_SEM_TIMEDWAIT_LIB) + CHECK_LIBRARY_EXISTS(pthread pthread_mutex_timedlock "" HAVE_MUTEX_TIMEDLOCK_LIB) +endif() + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(CMAKE_REQUIRED_DEFINITIONS "-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE") elseif(MINGW) @@ -389,8 +383,8 @@ if(WIN32) # Those files are not detected despite being present set(HAVE_MAKECONTEXT 1) endif() -set(CONTEXT_UCONTEXT 0) -set(CONTEXT_THREADS 0) +set(HAVE_UCONTEXT_CONTEXTS 0) +set(HAVE_THREAD_CONTEXTS 0) if(enable_jedule) set(HAVE_JEDULE 1) @@ -431,6 +425,9 @@ if(enable_smpi) 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) endif() endif() @@ -629,20 +626,15 @@ endif() #If can have both context if(HAVE_UCONTEXT) - set(CONTEXT_UCONTEXT 1) + set(HAVE_UCONTEXT_CONTEXTS 1) message("-- Support for ucontext factory") endif() if(HAVE_PTHREAD) - set(CONTEXT_THREADS 1) + set(HAVE_THREAD_CONTEXTS 1) message("-- Support for thread context factory") endif() -# Temp hack to disable context: -# set(CONTEXT_THREADS 0) -set(CONTEXT_UCONTEXT 0) -set(HAVE_RAWCTX 0) - ############### ## GIT version check ## @@ -746,11 +738,12 @@ endif() ### check for stackgrowth if (NOT CMAKE_CROSSCOMPILING) - try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR + try_run(RUN_stackgrowth_VAR COMPILE_stackgrowth_VAR ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stackgrowth.c RUN_OUTPUT_VARIABLE stack - ) + COPY_FILE test_stackgrowth + ) endif() if("${stack}" STREQUAL "down") set(PTH_STACKGROWTH "-1") @@ -762,7 +755,7 @@ else() elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") set(PTH_STACKGROWTH "-1") else() - message(ERROR "Could not figure the stack direction.") + message(FATAL_ERROR "Could not figure out the stack direction. Test prog returned: ${stack}; CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}.") endif() endif() @@ -770,123 +763,8 @@ endif() ## System checks ## -#SG_CONFIGURE_PART([System checks...]) -#AC_PROG_CC(xlC gcc cc) -auto -#AM_SANITY_CHECK -auto - -#AC_PROG_MAKE_SET - -#AC_CHECK_VA_COPY - -set(diff_va "va_copy((d),(s))" - "VA_COPY((d),(s))" - "__va_copy((d),(s))" - "__builtin_va_copy((d),(s))" - "do { (d) = (s)\; } while (0)" - "do { *(d) = *(s)\; } while (0)" - "memcpy((void *)&(d), (void *)&(s), sizeof(s))" - "memcpy((void *)(d), (void *)(s), sizeof(*(s)))" - ) - -foreach(fct ${diff_va}) - write_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_va_copy.c" "#include -#include -#include -#define DO_VA_COPY(d,s) ${fct} -void test(char *str, ...) -{ - va_list ap, ap2; - int i; - va_start(ap, str); - DO_VA_COPY(ap2, ap); - for (i = 1; i <= 9; i++) { - int k = (int)va_arg(ap, int); - if (k != i) - abort(); - } - DO_VA_COPY(ap, ap2); - for (i = 1; i <= 9; i++) { - int k = (int)va_arg(ap, int); - if (k != i) - abort(); - } - va_end(ap); -} -int main(void) -{ - test(\"test\", 1, 2, 3, 4, 5, 6, 7, 8, 9); - exit(0); -}" - ) - - execute_process( - COMMAND ${CMAKE_C_COMPILER} "${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_va_copy.c" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE COMPILE_VA_NULL_VAR - OUTPUT_QUIET - ERROR_QUIET - ) - - if(NOT COMPILE_VA_NULL_VAR) - string(REGEX REPLACE "\;" "" fctbis ${fct}) - if(${fctbis} STREQUAL "va_copy((d),(s))") - set(HAVE_VA_COPY 1) - set(ac_cv_va_copy "C99") - set(__VA_COPY_USE_C99 "va_copy((d),(s))") - endif() - - if(${fctbis} STREQUAL "VA_COPY((d),(s))") - set(ac_cv_va_copy "GCM") - set(__VA_COPY_USE_GCM "VA_COPY((d),(s))") - endif() - - if(${fctbis} STREQUAL "__va_copy((d),(s))") - set(ac_cv_va_copy "GCH") - set(__VA_COPY_USE_GCH "__va_copy((d),(s))") - endif() - - if(${fctbis} STREQUAL "__builtin_va_copy((d),(s))") - set(ac_cv_va_copy "GCB") - set(__VA_COPY_USE_GCB "__builtin_va_copy((d),(s))") - endif() - - if(${fctbis} STREQUAL "do { (d) = (s) } while (0)") - set(ac_cv_va_copy "ASS") - set(__VA_COPY_USE_ASS "do { (d) = (s); } while (0)") - endif() - - if(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)") - set(ac_cv_va_copy "ASP") - set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)") - endif() - - if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))") - set(ac_cv_va_copy "CPS") - set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))") - endif() - - if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))") - set(ac_cv_va_copy "CPP") - set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))") - endif() - - if(NOT STATUS_OK) - set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)") - endif() - set(STATUS_OK "1") - - endif() - -endforeach(fct ${diff_va}) - -#-------------------------------------------------------------------------------------------------- ### check for a working snprintf if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) - if(WIN32) - #set(HAVE_SNPRINTF 1) - #set(HAVE_VSNPRINTF 1) - endif() - if(CMAKE_CROSSCOMPILING) set(RUN_SNPRINTF_FUNC "cross") #set(PREFER_PORTABLE_SNPRINTF 1) @@ -1136,8 +1014,6 @@ endif() SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${generated_files_to_clean}") -configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE) - ### Define source packages for Libs include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake) @@ -1185,7 +1061,7 @@ else() find_program(WGET_PROGRAM NAMES wget) message(STATUS "wget: ${WGET_PROGRAM}") if(WGET_PROGRAM) - ADD_CUSTOM_TARGET(simgrid_documentation + 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