Be compatible with all plateforms.

[simgrid.git] / buildtools / Cmake / src / CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 8ae55f4..43ecd22 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -60,6 +60,10 @@ if(enable_tracing)
        SET(HAVE_TRACING 1)
 endif(enable_tracing)
 
+if(enable_model-checking)
+       SET(MMALLOC_WANT_OVERIDE_LEGACY 1)
+endif(enable_model-checking)
+
 if(enable_lua)
        exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
        string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")
@@ -684,15 +688,11 @@ endif(ADDR2LINE)
 configure_file(${PROJECT_DIRECTORY}/src/context_sysv_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/tmp_gras_config.h.in" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_BINARY_DIR}/tmp_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/tmp_gras_config.h.in)
-
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_config.h)
-
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/tmp_tracing_config.h.in" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_BINARY_DIR}/tmp_tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/tmp_tracing_config.h.in)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 if(NOT prefix)
        set(prefix /usr/local)