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}")
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}")
if (MSVC)
message(STATUS "Disable fast raw contextes on Microsoft Visual.")
else()
- set(HAVE_RAWCTX 1)
+ set(HAVE_RAW_CONTEXTS 1)
endif()
ENDIF()
include(CheckLibraryExists)
include(CheckSymbolExists)
+set(HAVE_GRAPHVIZ 0)
include(FindGraphviz)
include(FindLibSigc++)
-if(enable_scala)
- find_package(Scala REQUIRED)
- message("-- [Scala] scalac found: ${SCALA_COMPILE}")
- set(HAVE_Scala 1)
-endif()
+set(HAVE_LUA 0)
if(enable_lua)
include(FindLuaSimgrid)
endif()
endif()
endif()
-# Try again to see if we have libboost-context,
-# but only if the lib is not embeeded in the jar file to reduce the dependencies from the Java point of view
-if(enable_lib_in_jar)
- message(" (do not check for boost-context as you are building a full jarfile)")
- set(HAVE_BOOST_CONTEXT 0)
-else()
- 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_CONTEXT 1)
- else()
- message("Found Boost.Context API v2")
- set(HAVE_BOOST_CONTEXT 2)
- endif()
+# 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 (" boost : found.")
- message (" boost-context: missing. Install libboost-context-dev for this optional feature.")
- set(HAVE_BOOST_CONTEXT 0)
+ 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()
# 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)
CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H)
-CHECK_INCLUDE_FILE("socket.h" HAVE_SOCKET_H)
-CHECK_INCLUDE_FILE("stat.h" HAVE_STAT_H)
CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILE("sys/ptrace.h" HAVE_SYS_PTRACE_H)
CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H)
-CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
-CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H)
CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H)
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE)
CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
-CHECK_FUNCTION_EXISTS(readv HAVE_READV)
CHECK_FUNCTION_EXISTS(popen HAVE_POPEN)
-CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL)
-CHECK_SYMBOL_EXISTS(snprintf stdio.h HAVE_SNPRINTF)
-CHECK_SYMBOL_EXISTS(vsnprintf stdio.h HAVE_VSNPRINTF)
-CHECK_SYMBOL_EXISTS(asprintf stdio.h HAVE_ASPRINTF)
CHECK_SYMBOL_EXISTS(vasprintf stdio.h HAVE_VASPRINTF)
if(MINGW)
- # The detection of asprintf fails on MinGW, assumingly because it's
+ # The detection of vasprintf fails on MinGW, assumingly because it's
# defined as an inline function in stdio.h instead of a regular
# function. So force the result to be 1 despite of the test.
- set(HAVE_SNPRINTF 1)
- set(HAVE_VSNPRINTF 1)
- set(HAVE_ASPRINTF 1)
set(HAVE_VASPRINTF 1)
endif()
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)
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()
try_compile(HAVE_UCONTEXT
${CMAKE_BINARY_DIR}
${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c
- COMPILE_DEFINITIONS _XBT_WIN32
- INCLUDE_DIRECTORIES
- ${CMAKE_HOME_DIRECTORY}/src/include
- ${CMAKE_HOME_DIRECTORY}/src/xbt
+ COMPILE_DEFINITIONS -D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/src/include -I${CMAKE_HOME_DIRECTORY}/src/xbt
)
else()
# We always provide our own implementation of ucontext on Windows.
#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()
### 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")
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()
## 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 <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#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)
- else()
- try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
- ${CMAKE_BINARY_DIR}
- ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_snprintf.c
- )
- endif()
-
- if(CMAKE_CROSSCOMPILING)
- set(RUN_VSNPRINTF_FUNC "cross")
- set(PREFER_PORTABLE_VSNPRINTF 1)
- else()
- try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
- ${CMAKE_BINARY_DIR}
- ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_vsnprintf.c
- )
- endif()
-
- set(PREFER_PORTABLE_SNPRINTF 0)
- if(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
- set(PREFER_PORTABLE_SNPRINTF 1)
- endif()
- if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
- set(PREFER_PORTABLE_SNPRINTF 1)
- endif()
-endif()
-
-### check for asprintf function familly
-if(HAVE_ASPRINTF)
- SET(simgrid_need_asprintf "")
- SET(NEED_ASPRINTF 0)
-else()
- SET(simgrid_need_asprintf "#define SIMGRID_NEED_ASPRINTF 1")
- SET(NEED_ASPRINTF 1)
-endif()
-
-if(HAVE_VASPRINTF)
- SET(simgrid_need_vasprintf "")
- SET(NEED_VASPRINTF 0)
-else()
- SET(simgrid_need_vasprintf "#define SIMGRID_NEED_VASPRINTF 1")
- SET(NEED_VASPRINTF 1)
-endif()
-
### check for addr2line
-
find_path(ADDR2LINE NAMES addr2line PATHS NO_DEFAULT_PATHS )
if(ADDR2LINE)
set(ADDR2LINE "${ADDR2LINE}/addr2line")
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)
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
### Define subdirectories
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
+foreach(cmakefile ${CMAKEFILES_TXT})
+ string(REPLACE "/CMakeLists.txt" "" repository ${cmakefile})
+ add_subdirectory("${CMAKE_HOME_DIRECTORY}/${repository}")
+endforeach()
### Setup the distrib
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)
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