X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/323c04336e038c329cbbc35733fe7fa1333374f8..5311e400505dab190f66b60757cacdb6a0a018cf:/buildtools/Cmake/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 3b333b057f..a81b494c81 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -55,7 +55,7 @@ set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 SET(HAVE_RUBY 0)
 set(libruby "ruby1.8")
-if(NOT disable_ruby)
+if(enable_ruby)
 	include(FindRuby)
 	set(OKITOKI no)
 	foreach(path ${RUBY_INCLUDE_PATH})
@@ -81,17 +81,17 @@ if(NOT disable_ruby)
 		ADD_DEFINITIONS("-I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
 		SET(HAVE_RUBY 1)
 	endif(RUBY_INCLUDE_PATH)
-endif(NOT disable_ruby)
+endif(enable_ruby)
 
-if(tracing)
+if(enable_tracing)
 	SET(HAVE_TRACING 1)
-endif(tracing)
+endif(enable_tracing)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
-if(disable_java)
+if(NOT enable_java)
   	SET(HAVE_JAVA 0)
-else(disable_java)
+else(NOT enable_java)
 	include(FindJava)
 	include(FindJNI)
 	if(JAVA_INCLUDE_PATH)
@@ -106,26 +106,24 @@ else(disable_java)
 	else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
 		SET(HAVE_JAVA 0)
 	endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-endif(disable_java)
+endif(NOT enable_java)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT GTNETS
-if(disable_gtnets)
+if(NOT enable_gtnets)
 	SET(HAVE_GTNETS 0)
-else(disable_gtnets)
-	SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
+else(NOT enable_gtnets)
 	set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
 	set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
 	exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR)	
 	if(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 0)
-		message("GTnetS doesn't works : set -Ddisable_gtnets=on")
 	else(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 1)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
 	endif(COMPILE_GTNETS_VAR)
-endif(disable_gtnets)
+endif(NOT enable_gtnets)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
@@ -182,12 +180,13 @@ 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 "${PROJECT_DIRECTORY}/conftestval" mcsc)
-if(mcsc MATCHES "yes")
+file(READ "${Project_BINARY_DIR}/conftestval" mcsc)
+STRING(REPLACE "\n" "" mcsc ${mcsc})
+if(mcsc)
 	set(mcsc "yes")
-elseif(mcsc MATCHES "yes")
+elseif(mcsc)
 	set(mcsc "no")
-endif(mcsc MATCHES "yes")
+endif(mcsc)
 
 if(mcsc MATCHES "no" AND pthread)
 	if(HAVE_WINDOWS_H)
@@ -223,9 +222,9 @@ endif(with_context MATCHES "auto")
 
 if(with_context MATCHES "ucontext")
 	set(with_context_ok 1)
-	if(mcsc MATCHES "yes")
+	if(mcsc)
 		set(CONTEXT_UCONTEXT 1)
-	else(mcsc MATCHES "yes")
+	else(mcsc)
 		if(windows_context MATCHES "yes")
 			set(with_context "windows")
 			message("with_context ucontext change to windows")
@@ -233,7 +232,7 @@ if(with_context MATCHES "ucontext")
 			set(with_context "pthread")
 			message("with_context ucontext change to pthread")
 		endif(windows_context MATCHES "yes")
-	endif(mcsc MATCHES "yes")
+	endif(mcsc)
 endif(with_context MATCHES "ucontext")
 
 if(with_context MATCHES "pthread")
@@ -254,7 +253,7 @@ endif(NOT with_context_ok)
 
 set(HAVE_LUA 0)
 
-if(NOT disable_lua)
+if(enable_lua)
 	find_path(HAVE_LUA5_1_LUALIB_H
 	NAMES lualib.h 
 	PATHS "/sw/include/" "/usr/include/lua5.1/"
@@ -289,21 +288,24 @@ if(NOT disable_lua)
 
 	if(LUA_LIB_PATH_1)
 		set(liblua lua5.1)
+		set(lua_lib_path_to_use ${LUA_LIB_PATH_1})
 	endif(LUA_LIB_PATH_1)
 
 	if(LUA_LIB_PATH_2)
 		set(liblua lua-5.1)
+		set(lua_lib_path_to_use ${LUA_LIB_PATH_2})
 	endif(LUA_LIB_PATH_2)
 
 	if(LUA_LIB_PATH_3)
 		set(liblua lua.5.1.1)
+		set(lua_lib_path_to_use ${LUA_LIB_PATH_3})
 	endif(LUA_LIB_PATH_3)
 
 	if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
 		set(HAVE_LUA 0)
 	endif(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
 
-endif(NOT disable_lua)
+endif(enable_lua)
 
 ###############
 ## SVN version check
@@ -434,9 +436,12 @@ if(HAVE_MAKECONTEXT)
 		COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
 		)
 	
-
-	exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_addr")
-	exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_size")
+	file(READ ${Project_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}")
+	string(REPLACE "," "" makecontext_addr "${MAKECONTEXT_ADDR}")
+	string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}")	
 	set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
 	set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
 
@@ -450,7 +455,7 @@ endif(HAVE_MAKECONTEXT)
 		${PROJECT_DIRECTORY}
 		${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_stackgrowth.c
 		)
-file(READ "${PROJECT_DIRECTORY}/conftestval" stack)
+file(READ "${Project_BINARY_DIR}/conftestval" stack)
 if(stack MATCHES "down")
 	set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")