X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d16ebcee6bde01575b4cd88a853e1ac1c2532bf..d3b82ab21c706eff03f671a2a997c20b2e29889e:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 50a025279f..e00a914585 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -68,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)	
@@ -145,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)
@@ -193,10 +197,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)
 
 #--------------------------------------------------------------------------------------------------
@@ -327,7 +331,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)