+set(CMAKE_MODULE_PATH
+${CMAKE_MODULE_PATH}
+${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
+)
+
# x86_64
# x86
# i.86
TEST_BIG_ENDIAN(BIGENDIAN)
include(FindGraphviz)
-include(FindPCRE)
+if(WIN32)
+include(FindPcreWin)
+else(WIN32)
+include(FindPCRE)
+endif(WIN32)
set(HAVE_GTNETS 0)
if(enable_gtnets)
execute_process(
COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_thread_storage.c"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-OUTPUT_VARIABLE HAVE_thread_storage_run
+RESULT_VARIABLE HAVE_thread_storage_run
)
if(HAVE_thread_storage_run)
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)
#--------------------------------------------------------------------------------------------------
endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
if(WIN32)
- set(mcsc_flags "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+ 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)
###############
-## SVN version check
+## GIT version check
##
if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
exec_program("git remote | head -n 1" OUTPUT_VARIABLE remote RETURN_VALUE ret)
set(GRAS_BIGENDIAN 0)
endif(BIGENDIAN)
-# The syntax of this magic string is given in src/gras/DataDesc/ddt_convert.c
-# It kinda matches the values that the gras_arch_desc_t structure can take
+# 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 _.
# 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/gras/DataDesc/ddt_convert.c
+# 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.