X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea07feaa52a8efee7a96a1d4322dcf1105bc0df3..fae92523350bd2eed70cfbba094ac9a7d0ea2509:/buildtools/CPACK/src/CMakeCompleteInFiles.txt diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index 67fe25f93b..b949750407 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -2,8 +2,19 @@ include(CheckFunctionExists) include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckLibraryExists) +set(CONTEXT_UCONTEXT 0) +SET(CONTEXT_THREADS 0) +SET(RUBY_PATH "non") +find_program(FIND_EXE NAMES find) +exec_program("${FIND_EXE} /usr/lib -name ruby.h" OUTPUT_VARIABLE RUBY_PATH) +string(REPLACE "/ruby.h" "" RUBY_PATH ${RUBY_PATH}) +message("RUBY_PATH ${RUBY_PATH}") +CHECK_INCLUDE_FILE(${RUBY_PATH}/ruby.h HAVE_RUBY_H) + +if(HAVE_RUBY_H) + add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix") +endif(HAVE_RUBY_H) -message("\n_______CONTEXT________") #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT JAVA if(disable_java) @@ -20,18 +31,20 @@ else(disable_java) SET(HAVE_JAVA 0) endif(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH) endif(disable_java) -message("HAVE_JAVA ${HAVE_JAVA}") +#message("HAVE_JAVA ${HAVE_JAVA}") #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT GTNETS if(disable_gtnets) SET(HAVE_GTNETS 0) else(disable_gtnets) + SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE) set(GTNETS_LDFLAGS "-lgtnets -L${gtnets_path}/lib") - set(GTNETS_CPPFLAGS "-I${gtnets_path}/include -I${gtnets_path}/include/gtnets") + set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets") exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR) if(COMPILE_GTNETS_VAR) SET(HAVE_GTNETS 0) + message("GTnetS doesn't works : set -Ddisable_gtnets=on") else(COMPILE_GTNETS_VAR) SET(HAVE_GTNETS 1) set(INCLUDES @@ -41,7 +54,7 @@ else(disable_gtnets) add_definitions(${GTNETS_LDFLAGS}) endif(COMPILE_GTNETS_VAR) endif(disable_gtnets) -message("HAVE_GTNETS ${HAVE_GTNETS}") +#message("HAVE_GTNETS ${HAVE_GTNETS}") #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT THREADS @@ -64,7 +77,7 @@ if(pthread MATCHES "yes") else(HAVE_SEM_INIT_run) set(HAVE_SEM_INIT 1) endif(HAVE_SEM_INIT_run) - message("HAVE_SEM_INIT ${HAVE_SEM_INIT}") + #message("HAVE_SEM_INIT ${HAVE_SEM_INIT}") endif(HAVE_SEM_INIT_LIB) ### HAVE_SEM_TIMEDWAIT @@ -76,7 +89,7 @@ if(pthread MATCHES "yes") else(HAVE_SEM_TIMEDWAIT_run) set(HAVE_SEM_TIMEDWAIT 1) endif(HAVE_SEM_TIMEDWAIT_run) - message("HAVE_SEM_TIMEDWAIT ${HAVE_SEM_TIMEDWAIT}") + #message("HAVE_SEM_TIMEDWAIT ${HAVE_SEM_TIMEDWAIT}") endif(HAVE_SEM_TIMEDWAIT_LIB) ### HAVE_MUTEX_TIMEDLOCK @@ -88,119 +101,126 @@ if(pthread MATCHES "yes") else(HAVE_MUTEX_TIMEDLOCK_run) set(HAVE_MUTEX_TIMEDLOCK 1) endif(HAVE_MUTEX_TIMEDLOCK_run) - message("HAVE_MUTEX_TIMEDLOCK ${HAVE_MUTEX_TIMEDLOCK}") + #message("HAVE_MUTEX_TIMEDLOCK ${HAVE_MUTEX_TIMEDLOCK}") endif(HAVE_MUTEX_TIMEDLOCK_LIB) endif(pthread MATCHES "yes") # AC_CHECK_MCSC(mcsc=yes, mcsc=no) +set(mcsc_flags "") +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(mcsc_flags "-D_XOPEN_SOURCE") +endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") + try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_AC_CHECK_MCSC.c + COMPILE_DEFINITIONS "${mcsc_flags}" ) - file(READ "${PROJECT_DIRECTORY}/conftestval" mcsc) if(mcsc MATCHES "yes") set(mcsc "yes") elseif(mcsc MATCHES "yes") set(mcsc "no") endif(mcsc MATCHES "yes") - +CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) if(mcsc MATCHES "no" AND pthread MATCHES "no") - CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) if(HAVE_WINDOWS_H) set(windows_context "yes") set(IS_WINDOWS 1) elseif(HAVE_WINDOWS_H) - message("no appropriate backend found") + message(FATAL_ERROR "no appropriate backend found") endif(HAVE_WINDOWS_H) endif(mcsc MATCHES "no" AND pthread MATCHES "no") -if(NOT disable_context AND with_context MATCHES "ucontext" AND mcsc MATCHES "no") +if(with_context MATCHES "ucontext" AND mcsc MATCHES "no") message(FATAL_ERROR "-Dwith-context=ucontext specified but ucontext unusable.") -endif(NOT disable_context AND with_context MATCHES "ucontext" AND mcsc MATCHES "no") - -if(NOT disable_context) - set(with_context_ok 0) - if(with_context MATCHES "windows") - set(with_context_ok 1) - endif(with_context MATCHES "windows") - - if(with_context MATCHES "pthreads") - set(with_context_ok 1) - set(with_context "pthread") - endif(with_context MATCHES "pthreads") - - if(with_context MATCHES "auto") - set(with_context_ok 1) - set(with_context "ucontext") - message("with_context auto change to ucontext") - endif(with_context MATCHES "auto") - - if(with_context MATCHES "ucontext") - set(with_context_ok 1) - if(mcsc MATCHES "yes") - set(CONTEXT_UCONTEXT 1) - CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) - else(mcsc MATCHES "yes") - if(windows_context MATCHES "yes") - set(with_context "windows") - else(windows_context MATCHES "yes") - set(with_context "pthread") - endif(windows_context MATCHES "yes") - endif(mcsc MATCHES "yes") - endif(with_context MATCHES "ucontext") - - if(with_context MATCHES "pthread") - set(with_context_ok 1) - if(pthread MATCHES "no") - message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).") - endif(pthread MATCHES "no") - SET(CONTEXT_THREADS 1) - endif(with_context MATCHES "pthread") - - if(with_context MATCHES "ucontext") - SET(CONTEXT_THREADS 0) - endif(with_context MATCHES "ucontext") - - if(NOT with_context_ok) - message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread") - endif(NOT with_context_ok) -endif(NOT disable_context) - - -message("CONTEXT_THREADS ${CONTEXT_THREADS}") -message("CONTEXT_UCONTEXT ${CONTEXT_UCONTEXT}") - +endif(with_context MATCHES "ucontext" AND mcsc MATCHES "no") + +set(with_context_ok 0) +if(with_context MATCHES "windows") + set(with_context_ok 1) + if(NOT HAVE_WINDOWS_H) + message(FATAL_ERROR "no appropriate backend found windows") + endif(NOT HAVE_WINDOWS_H) +endif(with_context MATCHES "windows") + +if(with_context MATCHES "pthreads") + set(with_context_ok 1) + set(with_context "pthread") +endif(with_context MATCHES "pthreads") + +if(with_context MATCHES "auto") + set(with_context_ok 1) + set(with_context "ucontext") + message("with_context auto change to ucontext") +endif(with_context MATCHES "auto") + +if(with_context MATCHES "ucontext") + set(with_context_ok 1) + if(mcsc MATCHES "yes") + set(CONTEXT_UCONTEXT 1) + CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) + else(mcsc MATCHES "yes") + if(windows_context MATCHES "yes") + set(with_context "windows") + message("with_context ucontext change to windows") + else(windows_context MATCHES "yes") + set(with_context "pthread") + message("with_context ucontext change to pthread") + endif(windows_context MATCHES "yes") + endif(mcsc MATCHES "yes") +endif(with_context MATCHES "ucontext") + +if(with_context MATCHES "pthread") + set(with_context_ok 1) + if(pthread MATCHES "no") + message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).") + endif(pthread MATCHES "no") + SET(CONTEXT_THREADS 1) +endif(with_context MATCHES "pthread") + +if(with_context MATCHES "ucontext") + SET(CONTEXT_THREADS 0) +endif(with_context MATCHES "ucontext") + +if(NOT with_context_ok) + message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread") +endif(NOT with_context_ok) + + +#message("CONTEXT_THREADS ${CONTEXT_THREADS}") +#message("CONTEXT_UCONTEXT ${CONTEXT_UCONTEXT}") +set(HAVE_LUA 0) if(NOT disable_lua) CHECK_INCLUDE_FILE(lua5.1/lualib.h HAVE_LUA5_1_LUALIB_H) - message("HAVE_LUA5_1_LUALIB_H ${HAVE_LUA5_1_LUALIB_H}") + #message("HAVE_LUA5_1_LUALIB_H ${HAVE_LUA5_1_LUALIB_H}") if(HAVE_LUA5_1_LUALIB_H) set(HAVE_LUA 1) endif(HAVE_LUA5_1_LUALIB_H) endif(NOT disable_lua) -message("HAVE_LUA ${HAVE_LUA}") +#message("HAVE_LUA ${HAVE_LUA}") -message("______END_CONTEXT______") +#message("______END_CONTEXT______") ############### ## SVN version check ## -message("\n__________SVN__________") +#message("\n__________SVN__________") if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) #exec_program("svn up ${PROJECT_DIRECTORY}") find_file(SVN ".svn" ${PROJECT_DIRECTORY}) exec_program("svnversion ${PROJECT_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION") - message("SVN_VERSION ${SVN_VERSION}") + #message("SVN_VERSION ${SVN_VERSION}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) find_file(GIT ".git" ${PROJECT_DIRECTORY}) exec_program("git --git-dir=${PROJECT_DIRECTORY} log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION") - message("GIT_VERSION ${GIT_VERSION}") + #message("GIT_VERSION ${GIT_VERSION}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) -message("________END_SVN________") +#message("________END_SVN________\n") -message("\n_____GRAS_&_SIMGRID____") +#message("\n_____GRAS_&_SIMGRID____") ################################### ## SimGrid and GRAS specific checks ## @@ -219,66 +239,66 @@ else(BIGENDIAN) set(val_big "l${var1}") set(GRAS_BIGENDIAN 0) endif(BIGENDIAN) -message("GRAS_BIGENDIAN ${GRAS_BIGENDIAN}") -message("${val_big}") +#message("GRAS_BIGENDIAN ${GRAS_BIGENDIAN}") +#message("${val_big}") if(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:") - message("gras_arch=0; gras_size=32; gras_arch_name=little32_1;") + #message("gras_arch=0; gras_size=32; gras_arch_name=little32_1;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 0) endif(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") - message("gras_arch=1; gras_size=32; gras_arch_name=little32_2;") + #message("gras_arch=1; gras_size=32; gras_arch_name=little32_2;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 1) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") - message("gras_arch=2; gras_size=32; gras_arch_name=little32_4;") + #message("gras_arch=2; gras_size=32; gras_arch_name=little32_4;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 2) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") - message("gras_arch=3; gras_size=32; gras_arch_name=little32_8;") + #message("gras_arch=3; gras_size=32; gras_arch_name=little32_8;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 3) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") - message("gras_arch=4; gras_size=64; gras_arch_name=little64;") + #message("gras_arch=4; gras_size=64; gras_arch_name=little64;") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 4) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") - message("gras_arch=5; gras_size=32; gras_arch_name=big32;") + #message("gras_arch=5; gras_size=32; gras_arch_name=big32;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 5) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") - message("gras_arch=6; gras_size=32; gras_arch_name=big32_8_4;") + #message("gras_arch=6; gras_size=32; gras_arch_name=big32_8_4;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 6) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") - message("gras_arch=7; gras_size=32; gras_arch_name=big32_4;") + #message("gras_arch=7; gras_size=32; gras_arch_name=big32_4;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 7) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") - message("gras_arch=8; gras_size=32; gras_arch_name=big32_2;") + #message("gras_arch=8; gras_size=32; gras_arch_name=big32_2;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 8) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") - message("gras_arch=9; gras_size=64; gras_arch_name=big64;") + #message("gras_arch=9; gras_size=64; gras_arch_name=big64;") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 9) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") - message("gras_arch=10;gras_size=64; gras_arch_name=big64_8_4;") + #message("gras_arch=10;gras_size=64; gras_arch_name=big64_8_4;") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 10) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") - message("GRAS_ARCH_32_BITS ${GRAS_ARCH_32_BITS}") + #message("GRAS_ARCH_32_BITS ${GRAS_ARCH_32_BITS}") # Check architecture signature end @@ -290,7 +310,7 @@ try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR separate_arguments(var2) foreach(var_tmp ${var2}) set(${var_tmp} 1) - message("${var_tmp} ${${var_tmp}}") + #message("${var_tmp} ${${var_tmp}}") endforeach(var_tmp ${var2}) # Check for [SIZEOF_MAX] @@ -300,34 +320,29 @@ try_run(RUN_SM_VAR COMPILE_SM_VAR RUN_OUTPUT_VARIABLE var3 ) SET(SIZEOF_MAX ${var3}) -message("SIZEOF_MAX ${SIZEOF_MAX}") +#message("SIZEOF_MAX ${SIZEOF_MAX}") #-------------------------------------------------------------------------------------------------- CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT) -message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}") - +#message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}") +set(makecontext_CPPFLAGS_2 "") if(HAVE_MAKECONTEXT) set(makecontext_CPPFLAGS "-DTEST_makecontext") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(makecontext_CPPFLAGS_2 "-DOSX") - message("SYSTEM OSX") + #message("SYSTEM OSX") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") + try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c - COMPILE_DEFINITIONS ${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2} + COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" ) find_program(CAT_EXE NAMES cat) - if(COMPILE_makecontext_VAR) - set(makecontext_type "ok") - elseif(COMPILE_makecontext_VAR) - set(makecontext_type "guessed") - endif(COMPILE_makecontext_VAR) - exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_addr") exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_size") message("${makecontext_addr}") @@ -352,7 +367,7 @@ endif(stack MATCHES "down") if(stack MATCHES "up") set(PTH_STACKGROWTH "1") endif(stack MATCHES "up") -message("PTH_STACKGROWTH ${PTH_STACKGROWTH}") +#message("PTH_STACKGROWTH ${PTH_STACKGROWTH}") ############### @@ -377,7 +392,7 @@ SET(PRINTF_NULL_WORKING "0") else(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") SET(PRINTF_NULL_WORKING "1") endif(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") -message("PRINTF_NULL_WORKING ${PRINTF_NULL_WORKING}") +#message("PRINTF_NULL_WORKING ${PRINTF_NULL_WORKING}") #AC_CHECK_VA_COPY @@ -432,7 +447,7 @@ foreach(fct ${diff_va}) if(${fctbis} STREQUAL "va_copy((d),(s))") set(HAVE_VA_COPY 1) - message("HAVE_VA_COPY ${HAVE_VA_COPY}") + #message("HAVE_VA_COPY ${HAVE_VA_COPY}") set(ac_cv_va_copy "C99") set(__VA_COPY_USE_C99 "va_copy((d),(s))") endif(${fctbis} STREQUAL "va_copy((d),(s))") @@ -474,9 +489,9 @@ foreach(fct ${diff_va}) if(NOT STATUS_OK) set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}") - message("__VA_COPY_USE VA_COPY_USE_${ac_cv_va_copy}") + #message("__VA_COPY_USE VA_COPY_USE_${ac_cv_va_copy}") endif(NOT STATUS_OK) - message("__VA_COPY_USE_${ac_cv_va_copy} ${fctbis}") + #message("__VA_COPY_USE_${ac_cv_va_copy} ${fctbis}") set(STATUS_OK "1") endif(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN") @@ -485,45 +500,45 @@ endforeach(fct ${diff_va}) # Checks for header files. CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS) -message("STDC_HEADERS ${STDC_HEADERS}") +#message("STDC_HEADERS ${STDC_HEADERS}") CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME) -message("TIME_WITH_SYS_TIME ${TIME_WITH_SYS_TIME}") +#message("TIME_WITH_SYS_TIME ${TIME_WITH_SYS_TIME}") CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H) -message("HAVE_SOCKET_H ${HAVE_SOCKET_H}") +#message("HAVE_SOCKET_H ${HAVE_SOCKET_H}") CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H) -message("HAVE_STAT_H ${HAVE_STAT_H}") +#message("HAVE_STAT_H ${HAVE_STAT_H}") CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) -message("HAVE_WINDOWS_H ${HAVE_WINDOWS_H}") +#message("HAVE_WINDOWS_H ${HAVE_WINDOWS_H}") CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H) -message("HAVE_WINSOCK_H ${HAVE_WINSOCK_H}") +#message("HAVE_WINSOCK_H ${HAVE_WINSOCK_H}") CHECK_INCLUDE_FILE(winsock2.h HAVE_WINSOCK2_H) -message("HAVE_WINSOCK2_H ${HAVE_WINSOCK2_H}") +#message("HAVE_WINSOCK2_H ${HAVE_WINSOCK2_H}") CHECK_INCLUDE_FILE(sys/time.h HAVE_SYS_TIME_H) -message("HAVE_TIME_H ${HAVE_TIME_H}") +#message("HAVE_TIME_H ${HAVE_TIME_H}") CHECK_INCLUDE_FILE(errno.h HAVE_ERRNO_H) -message("HAVE_ERRNO_H ${HAVE_ERRNO_H}") +#message("HAVE_ERRNO_H ${HAVE_ERRNO_H}") CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H) -message("HAVE_UNISTD_H ${HAVE_UNISTD_H}") +#message("HAVE_UNISTD_H ${HAVE_UNISTD_H}") CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H) -message("HAVE_EXECINFO_H ${HAVE_EXECINFO_H}") +#message("HAVE_EXECINFO_H ${HAVE_EXECINFO_H}") CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H) -message("HAVE_SIGNAL_H ${HAVE_SIGNAL_H}") +#message("HAVE_SIGNAL_H ${HAVE_SIGNAL_H}") CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -message("HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY}") +#message("HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY}") CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP) -message("HAVE_USLEEP ${HAVE_USLEEP}") +#message("HAVE_USLEEP ${HAVE_USLEEP}") CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) -message("HAVE_GETDTABLESIZE ${HAVE_GETDTABLESIZE}") +#message("HAVE_GETDTABLESIZE ${HAVE_GETDTABLESIZE}") CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF) -message("HAVE_SYSCONF ${HAVE_SYSCONF}") +#message("HAVE_SYSCONF ${HAVE_SYSCONF}") CHECK_FUNCTION_EXISTS(readv HAVE_READV) -message("HAVE_READV ${HAVE_READV}") +#message("HAVE_READV ${HAVE_READV}") CHECK_FUNCTION_EXISTS(popen HAVE_POPEN) -message("HAVE_POPEN ${HAVE_POPEN}") +#message("HAVE_POPEN ${HAVE_POPEN}") CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL) -message("HAVE_SIGNAL ${HAVE_SIGNAL}") +#message("HAVE_SIGNAL ${HAVE_SIGNAL}") #-------------------------------------------------------------------------------------------------- ### Try execut getline command @@ -533,11 +548,11 @@ try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR OUTPUT_VARIABLE GETLINE_OUTPUT ) -if(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN") -SET(need_getline "") -else(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN") +if(NOT COMPILE_RESULT_VAR) SET(need_getline "#define SIMGRID_NEED_GETLINE 1") -endif(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN") +else(NOT COMPILE_RESULT_VAR) +SET(need_getline "") +endif(NOT COMPILE_RESULT_VAR) ### check for a working snprintf CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) @@ -549,7 +564,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF) ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_snprintf.c ) if(CMAKE_CROSSCOMPILING) - message("SNPRINTF_FUNC CROSSCOMPILING") + #message("SNPRINTF_FUNC CROSSCOMPILING") set(RUN_SNPRINTF_FUNC "cross") endif(CMAKE_CROSSCOMPILING) @@ -558,7 +573,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF) ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_vsnprintf.c ) if(CMAKE_CROSSCOMPILING) - message("VSNPRINTF_FUNC CROSSCOMPILING") + #message("VSNPRINTF_FUNC CROSSCOMPILING") set(RUN_VSNPRINTF_FUNC "cross") endif(CMAKE_CROSSCOMPILING) set(PREFER_PORTABLE_SNPRINTF 0) @@ -568,7 +583,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF) if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") set(PREFER_PORTABLE_SNPRINTF 1) endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") - message("PREFER_PORTABLE_SNPRINTF ${PREFER_PORTABLE_SNPRINTF}") + #message("PREFER_PORTABLE_SNPRINTF ${PREFER_PORTABLE_SNPRINTF}") endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF) ### check for asprintf function familly @@ -622,4 +637,4 @@ configure_file(${PROJECT_DIRECTORY}/CPACK/src/smpicc.in ${PROJECT_DIRECTORY}/src configure_file(${PROJECT_DIRECTORY}/CPACK/src/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY) -message("__END_GRAS_&_SIMGRID____\n") +#message("__END_GRAS_&_SIMGRID____\n")