${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
)
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+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$")
IF(${ARCH_32_BITS})
+ set(PROCESSOR_i686 1)
message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
ELSE(${ARCH_32_BITS})
message(STATUS "System processor: amd64")
if(HAVE_SEM_OPEN_run)
set(HAVE_SEM_OPEN 0)
else(HAVE_SEM_OPEN_run)
- exec_program("./testprog" RETURN_VALUE HAVE_SEM_OPEN_run2)
+ 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)
if(HAVE_SEM_INIT_run)
set(HAVE_SEM_INIT 0)
else(HAVE_SEM_INIT_run)
- exec_program("./testprog" RETURN_VALUE 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)
###############
## SVN version check
##
-if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
- find_file(SVN ".svn" ${CMAKE_HOME_DIRECTORY})
- exec_program("svnversion ${CMAKE_HOME_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION")
- message(STATUS "svn version ${SVN_VERSION}")
-else(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
- exec_program("git config --get svn-remote.svn.url"
- OUTPUT_VARIABLE url
- RETURN_VALUE ret)
-endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
+exec_program("git remote" OUTPUT_VARIABLE remote RETURN_VALUE ret)
+exec_program("git config --get remote.${remote}.url" OUTPUT_VARIABLE url RETURN_VALUE ret)
if(url)
exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION")
+ message(STATUS "Git version: ${GIT_VERSION}")
exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
-
+ message(STATUS "Git date: ${GIT_DATE}")
string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-
- exec_program("git svn info" ${CMAKE_HOME_DIRECTORY}
- OUTPUT_VARIABLE "GIT_SVN_VERSION")
- string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
- foreach(line ${GIT_SVN_VERSION})
- string(REGEX MATCH "^Revision:.*" line_good ${line})
- if(line_good)
- string(REPLACE "Revision: " ""
- line_good ${line_good})
- set(SVN_VERSION ${line_good})
- endif(line_good)
- endforeach(line ${GIT_SVN_VERSION})
endif(url)
set(GRAS_BIGENDIAN 0)
endif(BIGENDIAN)
+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:")
#gras_arch=0; gras_size=32; gras_arch_name=little32_1;
SET(GRAS_ARCH_32_BITS 1)
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:")
+if(GRAS_THISARCH MATCHES "none")
+ message(STATUS "architecture: ${val_big}")
+ message(FATAL_ERROR "GRAS_THISARCH is empty: '${GRAS_THISARCH}'")
+endif(GRAS_THISARCH MATCHES "none")
# Check architecture signature end
try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/platform.xml ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml COPYONLY)
- set(generate_files_to_clean
- ${generate_files_to_clean}
+ set(generated_files_to_clean
+ ${generated_files_to_clean}
${CMAKE_BINARY_DIR}/examples/smpi/hostfile
${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml
${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml
endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-"${generate_files_to_clean}")
+"${generated_files_to_clean}")
+
+
+IF(${ARCH_32_BITS})
+ set(WIN_ARCH "32")
+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)