Add stdarg.h for va_list.

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

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 8ae55f4..8379ad4 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}")
@@ -256,13 +260,18 @@ try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
        ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c
        COMPILE_DEFINITIONS "${mcsc_flags}"
        )
-file(READ "${CMAKE_BINARY_DIR}/conftestval" mcsc)
-STRING(REPLACE "\n" "" mcsc "${mcsc}")
-if(mcsc)
-       set(mcsc "yes")
-elseif(mcsc)
+       
+if(EXISTS "${simgrid_BINARY_DIR}/conftestval")
+       file(READ "${simgrid_BINARY_DIR}/conftestval" mcsc)
+       STRING(REPLACE "\n" "" mcsc "${mcsc}")
+       if(mcsc)
+               set(mcsc "yes")
+       elseif(mcsc)
+               set(mcsc "no")
+       endif(mcsc)
+else(EXISTS "${simgrid_BINARY_DIR}/conftestval")
        set(mcsc "no")
-endif(mcsc)
+endif(EXISTS "${simgrid_BINARY_DIR}/conftestval")
 
 if(mcsc MATCHES "no" AND pthread)
        if(HAVE_WINDOWS_H)
@@ -338,7 +347,8 @@ 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}/.git log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION")
+       exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION")
+       string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
        exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
        exec_program("git svn info" ${PROJECT_DIRECTORY} OUTPUT_VARIABLE "GIT_SVN_VERSION")
        string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
@@ -468,7 +478,7 @@ if(HAVE_MAKECONTEXT)
                COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
                )
        
-       file(READ ${CMAKE_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
+       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}")
@@ -487,7 +497,7 @@ endif(HAVE_MAKECONTEXT)
                ${PROJECT_DIRECTORY}
                ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_stackgrowth.c
                )
-file(READ "${CMAKE_BINARY_DIR}/conftestval" stack)
+file(READ "${simgrid_BINARY_DIR}/conftestval" stack)
 if(stack MATCHES "down")
        set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")
@@ -560,15 +570,12 @@ foreach(fct ${diff_va})
            exit(0);
        }"
        )
-       try_run(RUN_VA_NULL_VAR COMPILE_VA_NULL_VAR
+       try_compile(COMPILE_VA_NULL_VAR
        ${PROJECT_DIRECTORY}
        ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_va_copy.c
        )
-       if(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN")
-       else(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN")   
-
+       if(COMPILE_VA_NULL_VAR)
                string(REGEX REPLACE "\;" "" fctbis ${fct})
-
                if(${fctbis} STREQUAL "va_copy((d),(s))")
                        set(HAVE_VA_COPY 1)
                        set(ac_cv_va_copy "C99")
@@ -614,8 +621,9 @@ foreach(fct ${diff_va})
                set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}")
                endif(NOT STATUS_OK)
                set(STATUS_OK "1")
-
-       endif(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN")
+               
+       endif(COMPILE_VA_NULL_VAR)
+       
 endforeach(fct ${diff_va})
 
 #--------------------------------------------------------------------------------------------------
@@ -684,15 +692,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}/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/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" @ONLY IMMEDIATE)
+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)