Replace usleep for nanosleep

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 3b7ac73..bf896dd 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -1,3 +1,8 @@
+set(CMAKE_MODULE_PATH 
+${CMAKE_MODULE_PATH}
+${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
+)
+
 # x86_64
 # x86
 # i.86
@@ -63,7 +68,11 @@ include(TestBigEndian)
 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)      
@@ -122,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)
@@ -140,7 +149,7 @@ CHECK_FUNCTION_EXISTS(mergesort HAVE_MERGESORT)
 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)
@@ -164,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)
@@ -188,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)
 
 #--------------------------------------------------------------------------------------------------
@@ -322,7 +333,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 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)
@@ -395,7 +410,7 @@ endif(pthread)
 
 
 ###############
-## 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)
@@ -432,8 +447,8 @@ else(BIGENDIAN)
   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 _.  
@@ -452,7 +467,7 @@ endif(BIGENDIAN)
 #    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. 
@@ -820,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)
 
@@ -897,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)