X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a97310f9bb922ed0dcd349d9dbc324a957e4dc68..a94c908b9acf9a86f175c7f1c29b2c52e72eb2d2:/buildtools/Cmake/CompleteInFiles.cmake diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 700502ff57..bf896dd282 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -3,21 +3,18 @@ ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules ) -IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #Intel processor 64 bits - message(STATUS "System processor: amd64") - set(HAVE_RAWCTX 1) - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") #Intel processor 32 bits - message(STATUS "System processor: x86") - set(PROCESSOR_i686 1) - set(HAVE_RAWCTX 1) - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") +# x86_64 +# x86 +# i.86 + +IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") IF(${ARCH_32_BITS}) set(PROCESSOR_i686 1) + set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}") message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}") ELSE(${ARCH_32_BITS}) message(STATUS "System processor: amd64") + set(SIMGRID_SYSTEM_PROCESSOR "amd64") set(PROCESSOR_x86_64 1) set(PROCESSOR_i686 0) ENDIF(${ARCH_32_BITS}) @@ -58,7 +55,7 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh") ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}") -ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}") @@ -71,17 +68,21 @@ include(TestBigEndian) TEST_BIG_ENDIAN(BIGENDIAN) include(FindGraphviz) +if(WIN32) +include(FindPcreWin) +else(WIN32) +include(FindPCRE) +endif(WIN32) -string(TOUPPER ${enable_pcre} enable_pcre) -if(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON") -include(FindPCRE) -endif(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON") set(HAVE_GTNETS 0) if(enable_gtnets) include(FindGTnets) endif(enable_gtnets) if(enable_smpi) include(FindF2c) + if(HAVE_F2C_H) + SET(HAVE_SMPI 1) + endif(HAVE_F2C_H) endif(enable_smpi) if(enable_lua) include(FindLua51Simgrid) @@ -116,6 +117,8 @@ CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) CHECK_INCLUDE_FILE("execinfo.h" HAVE_EXECINFO_H) CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H) CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_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("dlfcn.h" HAVE_DLFCN_H) CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) @@ -128,7 +131,7 @@ 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(usleep HAVE_USLEEP) +CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP) CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF) CHECK_FUNCTION_EXISTS(readv HAVE_READV) @@ -143,8 +146,12 @@ CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP) CHECK_FUNCTION_EXISTS(mergesort HAVE_MERGESORT) #Check if __thread is defined -exec_program("${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_thread_storage.c" - OUTPUT_VARIABLE HAVE_thread_storage_run) +execute_process( +COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_thread_storage.c" +WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +RESULT_VARIABLE HAVE_thread_storage_run +) + if(HAVE_thread_storage_run) set(HAVE_THREAD_LOCAL_STORAGE 0) else(HAVE_thread_storage_run) @@ -166,10 +173,12 @@ endif(WIN32) set(CONTEXT_UCONTEXT 0) SET(CONTEXT_THREADS 0) -SET(HAVE_TRACING 0) +SET(HAVE_TRACING 1) if(enable_tracing) SET(HAVE_TRACING 1) +else(enable_tracing) + SET(HAVE_TRACING 0) endif(enable_tracing) if(enable_jedule) @@ -190,10 +199,10 @@ endif(enable_latency_bound_tracking) if(enable_model-checking AND HAVE_MMAP) SET(HAVE_MC 1) - SET(MMALLOC_WANT_OVERIDE_LEGACY 1) + SET(MMALLOC_WANT_OVERRIDE_LEGACY 1) else(enable_model-checking AND HAVE_MMAP) SET(HAVE_MC 0) - SET(MMALLOC_WANT_OVERIDE_LEGACY 0) + SET(MMALLOC_WANT_OVERRIDE_LEGACY 0) endif(enable_model-checking AND HAVE_MMAP) #-------------------------------------------------------------------------------------------------- @@ -213,63 +222,105 @@ endif(pthread) if(pthread) ### Test that we have a way to create semaphores - - if(HAVE_SEM_OPEN_LIB) - exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -o testprog" - OUTPUT_VARIABLE HAVE_SEM_OPEN_run) - if(HAVE_SEM_OPEN_run) - set(HAVE_SEM_OPEN 0) - else(HAVE_SEM_OPEN_run) - exec_program("./testprog" RETURN_VALUE HAVE_SEM_OPEN_run2 OUTPUT_VARIABLE var_compil) - if(HAVE_SEM_OPEN_run2) - set(HAVE_SEM_OPEN 0) - else(HAVE_SEM_OPEN_run2) - set(HAVE_SEM_OPEN 1) - endif(HAVE_SEM_OPEN_run2) - endif(HAVE_SEM_OPEN_run) - else(HAVE_SEM_OPEN_LIB) + + if(HAVE_SEM_OPEN_LIB) + + exec_program( + "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -lpthread -o testprog" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + OUTPUT_VARIABLE HAVE_SEM_OPEN_compil + ) + + if(HAVE_SEM_OPEN_compil) + set(HAVE_SEM_OPEN 0) + message(STATUS "Warning: sem_open not compilable") + message(STATUS "HAVE_SEM_OPEN_comp_output: ${HAVE_SEM_OPEN_comp_output}") + else(HAVE_SEM_OPEN_compil) + set(HAVE_SEM_OPEN 1) + message(STATUS "sem_open is compilable") + endif(HAVE_SEM_OPEN_compil) + + exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_OPEN_run OUTPUT_VARIABLE var_compil) + file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") + + if(NOT HAVE_SEM_OPEN_run) + set(HAVE_SEM_OPEN 1) + message(STATUS "sem_open is executable") + else(NOT HAVE_SEM_OPEN_run) + set(HAVE_SEM_OPEN 0) + message(STATUS "Warning: sem_open not executable") + endif(NOT HAVE_SEM_OPEN_run) + + else(HAVE_SEM_OPEN_LIB) set(HAVE_SEM_OPEN 0) endif(HAVE_SEM_OPEN_LIB) if(HAVE_SEM_INIT_LIB) - exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -o testprog" - OUTPUT_VARIABLE HAVE_SEM_INIT_run) - if(HAVE_SEM_INIT_run) - set(HAVE_SEM_INIT 0) - else(HAVE_SEM_INIT_run) - exec_program("./testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil) - if(HAVE_SEM_INIT_run) - set(HAVE_SEM_INIT 0) - else(HAVE_SEM_INIT_run) - set(HAVE_SEM_INIT 1) - endif(HAVE_SEM_INIT_run) - endif(HAVE_SEM_INIT_run) - else(HAVE_SEM_INIT_LIB) - set(HAVE_SEM_INIT 0) + exec_program( + "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o testprog" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + OUTPUT_VARIABLE HAVE_SEM_INIT_compil + ) + + if(HAVE_SEM_INIT_compil) + set(HAVE_SEM_INIT 0) + message(STATUS "Warning: sem_init not compilable") + message(STATUS "HAVE_SEM_INIT_comp_output: ${HAVE_SEM_OPEN_comp_output}") + else(HAVE_SEM_INIT_compil) + set(HAVE_SEM_INIT 1) + message(STATUS "sem_init is compilable") + endif(HAVE_SEM_INIT_compil) + + exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil) + file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") + + if(NOT HAVE_SEM_INIT_run) + set(HAVE_SEM_INIT 1) + message(STATUS "sem_init is executable") + else(NOT HAVE_SEM_INIT_run) + set(HAVE_SEM_INIT 0) + message(STATUS "Warning: sem_init not executable") + endif(NOT HAVE_SEM_INIT_run) endif(HAVE_SEM_INIT_LIB) if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) - message(FATAL_ERROR "Semaphores are not usable, but they are mandatory to threads (you may need to mount /dev).") + message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).") endif(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) ### Test that we have a way to timewait for semaphores if(HAVE_SEM_TIMEDWAIT_LIB) - exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c" OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run) + + execute_process( + COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c -lpthread" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run + ) + if(HAVE_SEM_TIMEDWAIT_run) set(HAVE_SEM_TIMEDWAIT 0) + message(STATUS "timedwait not compilable") else(HAVE_SEM_TIMEDWAIT_run) set(HAVE_SEM_TIMEDWAIT 1) + message(STATUS "timedwait is compilable") endif(HAVE_SEM_TIMEDWAIT_run) endif(HAVE_SEM_TIMEDWAIT_LIB) ### HAVE_MUTEX_TIMEDLOCK if(HAVE_MUTEX_TIMEDLOCK_LIB) - exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c" OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run) + + execute_process( + COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c -lpthread" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + OUTPUT_VARIABLE HAVE_MUTEX_TIMEDLOCK_run + ) + if(HAVE_MUTEX_TIMEDLOCK_run) set(HAVE_MUTEX_TIMEDLOCK 0) + message(STATUS "timedlock not compilable") else(HAVE_MUTEX_TIMEDLOCK_run) + message(STATUS "timedlock is compilable") set(HAVE_MUTEX_TIMEDLOCK 1) endif(HAVE_MUTEX_TIMEDLOCK_run) endif(HAVE_MUTEX_TIMEDLOCK_LIB) @@ -282,12 +333,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") if(WIN32) - if(__VISUALC__) - set(mcsc_flags "/D_XBT_WIN32 /I${CMAKE_HOME_DIRECTORY}/include/xbt /I${CMAKE_HOME_DIRECTORY}/src/xbt") - endif(__VISUALC__) - if(__GNUC__) - set(mcsc_flags "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") - endif(__GNUC__) + if(ARCH_32_BITS) + set(mcsc_flags "-D_XBT_WIN32 -D_I_X86_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") + else(ARCH_32_BITS) + set(mcsc_flags "-D_XBT_WIN32 -D_AMD64_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") + endif(ARCH_32_BITS) endif(WIN32) IF(CMAKE_CROSSCOMPILING) @@ -296,25 +346,35 @@ IF(CMAKE_CROSSCOMPILING) set(IS_WINDOWS 1) ENDIF(WIN32) ELSE(CMAKE_CROSSCOMPILING) - try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR - ${simgrid_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c - COMPILE_DEFINITIONS "${mcsc_flags}" - OUTPUT_VARIABLE var_compil - ) - - if(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR) - file(READ "${simgrid_BINARY_DIR}/conftestval" mcsc) - STRING(REPLACE "\n" "" mcsc "${mcsc}") - if(mcsc) - set(mcsc "yes") - set(HAVE_UCONTEXT_H 1) - else(mcsc) - set(mcsc "no") - endif(mcsc) - else(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR) + file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") + file(REMOVE ${CMAKE_BINARY_DIR}/conftestval) + exec_program( + "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/ + OUTPUT_VARIABLE COMPILE_mcsc_VAR) + + if(NOT COMPILE_mcsc_VAR) + message(STATUS "prog_AC_CHECK_MCSC.c is compilable") + exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil) + else(NOT COMPILE_mcsc_VAR) + message(STATUS "prog_AC_CHECK_MCSC.c is not compilable") + endif(NOT COMPILE_mcsc_VAR) + file(REMOVE "${CMAKE_BINARY_DIR}/testprog*") + + if(EXISTS "${CMAKE_BINARY_DIR}/conftestval") + file(READ "${CMAKE_BINARY_DIR}/conftestval" mcsc) + STRING(REPLACE "\n" "" mcsc "${mcsc}") + if(mcsc) + set(mcsc "yes") + set(HAVE_UCONTEXT_H 1) + else(mcsc) set(mcsc "no") - endif(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR) + endif(mcsc) + else(EXISTS "${CMAKE_BINARY_DIR}/conftestval") + set(mcsc "no") + endif(EXISTS "${CMAKE_BINARY_DIR}/conftestval") + + message(STATUS "mcsc: ${mcsc}") ENDIF(CMAKE_CROSSCOMPILING) if(mcsc MATCHES "no" AND pthread) @@ -350,9 +410,10 @@ endif(pthread) ############### -## SVN version check +## GIT version check ## -exec_program("git remote" OUTPUT_VARIABLE remote RETURN_VALUE ret) +if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32) +exec_program("git remote | head -n 1" OUTPUT_VARIABLE remote RETURN_VALUE ret) exec_program("git config --get remote.${remote}.url" OUTPUT_VARIABLE url RETURN_VALUE ret) if(url) @@ -365,7 +426,7 @@ if(url) STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE}) STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE}) endif(url) - +endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32) ################################### ## SimGrid and GRAS specific checks @@ -374,7 +435,7 @@ endif(url) IF(NOT CMAKE_CROSSCOMPILING) # Check architecture signature begin try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c RUN_OUTPUT_VARIABLE var1 ) @@ -386,6 +447,34 @@ else(BIGENDIAN) set(GRAS_BIGENDIAN 0) endif(BIGENDIAN) +# The syntax of this magic string is given in src/xbt/datadesc/ddt_convert.c +# It kinda matches the values that the xbt_arch_desc_t structure can take + +# Basically, the syntax is one char l or B for endianness (little or Big) +# then there is a bunch of blocks separated by _. +# C block is for char, I block for integers, P block for pointers and +# D block for floating points +# For each block there is an amount of chuncks separated by :, each of +# them describing a data size. For example there is only one chunk +# in the char block, because no architecture provide several sizes +# of chars. In integer block, there is 4 chunks: "short int", "int", +# "long int", "long long int". There is 2 pointer chunks for data +# pointers and pointers on functions (thanks to the AMD64 madness). +# Thee two floating points chuncks are for "float" and "double". +# Each chunk is of the form datasize/minimal_alignment_size + +# These informations are used to convert a data stream from one +# formalism to another. Only the GRAS_ARCH is transfered in the +# stream, and it it of cruxial importance to keep these detection +# information here synchronized with the data hardcoded in the +# source in src/xbt/datadesc/ddt_convert.c + +# If you add something here (like a previously unknown architecture), +# please add it to the source code too. +# Please do not modify stuff here since it'd break the GRAS protocol. +# If you really need to change stuff, please also bump +# GRAS_PROTOCOL_VERSION in src/gras/Msg/msg_interface.h + SET(GRAS_THISARCH "none") 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:") @@ -413,36 +502,41 @@ 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:") 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 "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:") + #gras_arch=5; gras_size=64; gras_arch_name=little64_2; + SET(GRAS_ARCH_32_BITS 0) + SET(GRAS_THISARCH 5) +endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4: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:") - #gras_arch=5; gras_size=32; gras_arch_name=big32; + #gras_arch=6; gras_size=32; gras_arch_name=big32_8; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 5) + 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/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:") - #gras_arch=6; gras_size=32; gras_arch_name=big32_8_4; + #gras_arch=7; gras_size=32; gras_arch_name=big32_8_4; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 6) + SET(GRAS_THISARCH 7) 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:") - #gras_arch=7; gras_size=32; gras_arch_name=big32_4; + #gras_arch=8; gras_size=32; gras_arch_name=big32_4; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 7) + SET(GRAS_THISARCH 8) 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:") - #gras_arch=8; gras_size=32; gras_arch_name=big32_2; + #gras_arch=9; gras_size=32; gras_arch_name=big32_2; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 8) + SET(GRAS_THISARCH 9) 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:") - #gras_arch=9; gras_size=64; gras_arch_name=big64; + #gras_arch=10; gras_size=64; gras_arch_name=big64; SET(GRAS_ARCH_32_BITS 0) - SET(GRAS_THISARCH 9) + 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/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:") - #gras_arch=10;gras_size=64; gras_arch_name=big64_8_4; + #gras_arch=11; gras_size=64; gras_arch_name=big64_8_4; SET(GRAS_ARCH_32_BITS 0) - SET(GRAS_THISARCH 10) + SET(GRAS_THISARCH 11) 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:") if(GRAS_THISARCH MATCHES "none") @@ -452,7 +546,7 @@ endif(GRAS_THISARCH MATCHES "none") # Check architecture signature end try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c RUN_OUTPUT_VARIABLE var2 ) @@ -463,10 +557,11 @@ endforeach(var_tmp ${var2}) # Check for [SIZEOF_MAX] try_run(RUN_SM_VAR COMPILE_SM_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c RUN_OUTPUT_VARIABLE var3 ) +message(STATUS "SIZEOF_MAX ${var3}") SET(SIZEOF_MAX ${var3}) ENDIF(NOT CMAKE_CROSSCOMPILING) @@ -479,29 +574,37 @@ if(HAVE_MAKECONTEXT OR WIN32) set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - if(WIN32 AND __VISUALC__) - set(makecontext_CPPFLAGS "/DTEST_makecontext") - set(makecontext_CPPFLAGS_2 "/D_XBT_WIN32 /I${CMAKE_HOME_DIRECTORY}/include/xbt /I${CMAKE_HOME_DIRECTORY}/src/xbt") - endif(WIN32 AND __VISUALC__) - if(WIN32 AND __GNUC__) - set(makecontext_CPPFLAGS "-DTEST_makecontext") + if(WIN32) + if(ARCH_32_BITS) + set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_") + else(ARCH_32_BITS) + set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_") + endif(ARCH_32_BITS) set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt") - endif(WIN32 AND __GNUC__) + endif(WIN32) + + file(REMOVE ${CMAKE_BINARY_DIR}/conftestval) try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" ) - file(READ ${simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE) - string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}") - string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}") - string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}") - string(REPLACE "," "" makecontext_addr "${MAKECONTEXT_ADDR}") - string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}") - set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})") - set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})") - + + if(EXISTS ${CMAKE_BINARY_DIR}/conftestval) + file(READ ${CMAKE_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE) + string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}") + string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}") + string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}") + string(REPLACE "," "" makecontext_addr "${MAKECONTEXT_ADDR}") + string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}") + set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})") + set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})") + message(STATUS "${pth_skaddr_makecontext}") + message(STATUS "${pth_sksize_makecontext}") + else(EXISTS ${CMAKE_BINARY_DIR}/conftestval) +# message(FATAL_ERROR "makecontext is not compilable") + endif(EXISTS ${CMAKE_BINARY_DIR}/conftestval) endif(HAVE_MAKECONTEXT OR WIN32) #-------------------------------------------------------------------------------------------------- @@ -509,10 +612,10 @@ endif(HAVE_MAKECONTEXT OR WIN32) ### check for stackgrowth if (NOT CMAKE_CROSSCOMPILING) try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c ) -file(READ "${simgrid_BINARY_DIR}/conftestval" stack) +file(READ "${CMAKE_BINARY_DIR}/conftestval" stack) if(stack MATCHES "down") set(PTH_STACKGROWTH "-1") endif(stack MATCHES "down") @@ -534,7 +637,7 @@ endif(NOT CMAKE_CROSSCOMPILING) #AC_PRINTF_NULL try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c ) @@ -587,7 +690,7 @@ foreach(fct ${diff_va}) }" ) try_compile(COMPILE_VA_NULL_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c ) if(COMPILE_VA_NULL_VAR) @@ -645,7 +748,7 @@ endforeach(fct ${diff_va}) #-------------------------------------------------------------------------------------------------- ### check for getline try_compile(COMPILE_RESULT_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c ) @@ -669,7 +772,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) #set(PREFER_PORTABLE_SNPRINTF 1) else(CMAKE_CROSSCOMPILING) try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c ) endif(CMAKE_CROSSCOMPILING) @@ -679,7 +782,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) set(PREFER_PORTABLE_VSNPRINTF 1) else(CMAKE_CROSSCOMPILING) try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR - ${simgrid_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c ) endif(CMAKE_CROSSCOMPILING) @@ -732,7 +835,7 @@ endif(APPLE) configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in" "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE) SET( CMAKEDEFINE "#cmakedefine" ) -configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/gras_config.h.in" "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE) +configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/gras_config.h.in" "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE) configure_file("${CMAKE_BINARY_DIR}/src/gras_config.h" "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE) configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE) @@ -752,10 +855,12 @@ configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_BINARY_DIR}/b configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_BINARY_DIR}/bin/smpiff @ONLY) configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_BINARY_DIR}/bin/smpirun @ONLY) +if(NOT WIN32) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE OKITOKI) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI) exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI) +endif(NOT WIN32) set(generated_headers_to_install ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h @@ -776,7 +881,7 @@ ${CMAKE_BINARY_DIR}/bin/smpiff ${CMAKE_BINARY_DIR}/bin/smpirun ${CMAKE_BINARY_DIR}/bin/colorize ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml -${CMAKE_BINARY_DIR}/examples/smpi/smpi_traced.trace +${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace ${CMAKE_BINARY_DIR}/src/supernovae_sg.c ${CMAKE_BINARY_DIR}/src/supernovae_gras.c ${CMAKE_BINARY_DIR}/src/supernovae_smpi.c @@ -807,4 +912,4 @@ IF(${ARCH_32_BITS}) ELSE(${ARCH_32_BITS}) set(WIN_ARCH "64") ENDIF(${ARCH_32_BITS}) -configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE) +configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)