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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 5c6e95a983..479b997c3f 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -2,6 +2,9 @@ include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
+if(APPLE)
+set( CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} /opt/local/include")
+endif(APPLE)
 
 # Checks for header libraries functions.
 
@@ -35,7 +38,7 @@ CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
 CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
 CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H)
-
+CHECK_INCLUDE_FILE(graphviz/cgraph.h HAVE_CGRAPH_H)
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP)
 CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE)
@@ -76,11 +79,11 @@ endif(enable_model-checking AND HAVE_MMAP)
 
 if(enable_lua)
 	exec_program("lua -v" OUTPUT_VARIABLE LUA_VERSION)
-	string(REGEX MATCH "[0-9].[0-9].[0-9]" LUA_VERSION "${LUA_VERSION}")
-	string(REGEX MATCH "^[0-9]" LUA_MAJOR_VERSION "${LUA_VERSION}")
-	string(REPLACE "${LUA_MAJOR_VERSION}." "" LUA_VERSION "${LUA_VERSION}")
-	string(REGEX MATCH "^[0-9]" LUA_MINOR_VERSION "${LUA_VERSION}")
-	string(REPLACE "${LUA_MINOR_VERSION}." "" LUA_PATCH_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" LUA_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "^[0-9]+" LUA_MAJOR_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "[0-9]+[.]+[0-9]+$" LUA_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "^[0-9]+" LUA_MINOR_VERSION "${LUA_VERSION}")
+	string(REGEX MATCH "[0-9]+$" LUA_PATCH_VERSION "${LUA_VERSION}")
 
 	if(LUA_MAJOR_VERSION MATCHES "5" AND LUA_MINOR_VERSION MATCHES "1")
 	
@@ -481,7 +484,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
 	endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	
 	if(WIN32)
-	    set(makecontext_CPPFLAGS_2 "-DWIN32 ${INCLUDES}")
+	    set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 ${INCLUDES}")
 	endif(WIN32)
 
 	try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR