X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/61e51ed458b9c4bc40343c50fc28ab0f3da72eaa..db05675574d8c8bfafd025fbaadf6e145ce41ecb:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index f721971773..cb9488380e 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -1,16 +1,35 @@
+set(CMAKE_MODULE_PATH 
+${CMAKE_MODULE_PATH}
+${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
+)
+
+message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
+
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(TestBigEndian)
-
 TEST_BIG_ENDIAN(BIGENDIAN)
 
-# Checks for header libraries functions.
-
-find_library(HAVE_CGRAPH_LIB cgraph)
-find_file(HAVE_CGRAPH_H graphviz/cgraph.h)
+include(FindGraphviz)
+if(enable_pcre)
+include(FindPCRE)
+endif(enable_pcre)
+if(enable_gtnets)	
+	include(FindGTnets)
+endif(enable_gtnets)
+if(enable_ruby)
+	include(FindRubySimgrid)	
+endif(enable_ruby)
+if(enable_smpi)
+	include(FindF2c)
+endif(enable_smpi)
+if(enable_lua)
+	include(FindLua51Simgrid)
+endif(enable_lua)
 
+# Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(pthread 	pthread_create 		NO_DEFAULT_PATHS pthread)
 CHECK_LIBRARY_EXISTS(pthread 	sem_init 		NO_DEFAULT_PATHS HAVE_SEM_INIT_LIB)
 CHECK_LIBRARY_EXISTS(pthread 	sem_timedwait 		NO_DEFAULT_PATHS HAVE_SEM_TIMEDWAIT_LIB)
@@ -66,9 +85,6 @@ endif(WIN32)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
-SET(HAVE_RUBY 0)
-set(HAVE_LUA 0)
-SET(HAVE_JAVA 0)
 SET(HAVE_TRACING 0)
 
 if(enable_tracing)
@@ -79,6 +95,7 @@ if(enable_latency_bound_tracking)
 	SET(HAVE_LATENCY_BOUND_TRACKING 1)
 else(enable_latency_bound_tracking)
   if(enable_gtnets)
+    message(STATUS "Warning : Turning latency_bound_tracking to ON because GTNeTs is ON")
     SET(enable_latency_bound_tracking ON)
     SET(HAVE_LATENCY_BOUND_TRACKING 1)
   else(enable_gtnets)
@@ -94,138 +111,6 @@ else(enable_model-checking AND HAVE_MMAP)
 	SET(MMALLOC_WANT_OVERIDE_LEGACY 0)
 endif(enable_model-checking AND HAVE_MMAP)
 
-if(enable_lua)
-	include(FindLua51)
-	if(LUA51_FOUND)
-		set(HAVE_LUA 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${LUA_INCLUDE_DIR} ")
-		foreach(path_lua ${LUA_LIBRARIES})
-		string(REGEX REPLACE "liblua.*" "" path_lua_to_use ${path_lua})
-		string(REGEX MATCH ".*lua.*" operation "${path_lua}")
-		if(operation)
-			string(REGEX REPLACE "${path_lua_to_use}" "" liblua ${path_lua})
-			string(REPLACE "lib" "" liblua "${liblua}")
-			string(REGEX REPLACE "[.][^.]*$" "" liblua "${liblua}")			
-		endif(operation)
-		endforeach(path_lua ${LUA_LIBRARIES})
-	else(LUA51_FOUND)
-		message("Lua binding need version 5.1 and cmake version 2.8")
-		message("Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
-	endif(LUA51_FOUND)
-endif(enable_lua)
-
-if(enable_ruby)
-	include(FindRuby)
-	if(RUBY_LIBRARY)
-		if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
-			set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
-			string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
-			if(NOT RUBY_LIBRARY_NAME)
-				set(RUBY_LIBRARY_NAME ruby)
-			endif(NOT RUBY_LIBRARY_NAME)
-			string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
-			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
-			string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
-			if(NOT operation)
-				SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_INCLUDE_DIR} ") #path to ruby.h
-			endif(NOT operation)
-			ADD_DEFINITIONS("-I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
-			SET(HAVE_RUBY 1)
-		else(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
-			message("Ruby binding need version 1.8.x actually version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
-			SET(HAVE_RUBY 0)
-		endif(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
-	else(RUBY_LIBRARY)
-		SET(HAVE_RUBY 0)
-	endif(RUBY_LIBRARY)
-	
-	if(NOT RUBY_EXECUTABLE)
-		message("Take care : you don't have ruby executable so you can compile and build examples but can't execute them!!!") 
-	endif(NOT RUBY_EXECUTABLE)
-	
-endif(enable_ruby)
-
-#--------------------------------------------------------------------------------------------------
-### Initialize of CONTEXT JAVA
-
-if(enable_java)
-	include(FindJava)
-	include(FindJNI)
-	if(JAVA_INCLUDE_PATH)
-		set(HAVE_JNI_H 1)
-	endif(JAVA_INCLUDE_PATH)	
-	if(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-		SET(HAVE_JAVA 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
-		if(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH2} ")			
-		endif(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-	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(enable_java)
-
-#--------------------------------------------------------------------------------------------------
-### Initialize of CONTEXT GTNETS
-if(NOT enable_gtnets OR enable_supernovae)
-	SET(HAVE_GTNETS 0)
-else(NOT enable_gtnets OR enable_supernovae)
-	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/test_prog/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR)	
-	if(COMPILE_GTNETS_VAR)
-		SET(HAVE_GTNETS 0)
-	else(COMPILE_GTNETS_VAR)
-		SET(HAVE_GTNETS 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ")
-		string(REGEX MATCH "${gtnets_path}/lib" operation "$ENV{LD_LIBRARY_PATH}")
-		if(NOT operation)
-			message(FATAL_ERROR "\n\nTo use GTNETS don't forget to set LD_LIBRARY_PATH with \n\texport LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${gtnets_path}/lib\n\n")
-		endif(NOT operation)
-	endif(COMPILE_GTNETS_VAR)
-endif(NOT enable_gtnets OR enable_supernovae)
-
-#--------------------------------------------------------------------------------------------------
-### Initialize of cgraph
-mark_as_advanced(HAVE_CGRAPH_LIB)
-mark_as_advanced(HAVE_CGRAPH_H)
-
-if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
-	string(REGEX REPLACE "/libcgraph.*" "" lib_cgraph ${HAVE_CGRAPH_LIB})
-	string(REPLACE "/cgraph.h" "" file_cgraph_h ${HAVE_CGRAPH_H})
-	string(REGEX MATCH "-I${file_cgraph_h} " operation "${CMAKE_C_FLAGS}")
-	if(NOT operation)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_cgraph_h} ")
-	endif(NOT operation)
-	string(REGEX MATCH "-L${lib_cgraph} " operation "${CMAKE_C_FLAGS}")
-	if(NOT operation)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${lib_cgraph} ")
-	endif(NOT operation)
-	
-endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
-
-#--------------------------------------------------------------------------------------------------
-### Initialize of pcre
-find_library(PATH_PCRE_LIB pcre)
-find_file(PATH_PCRE_H "pcre.h")
-set(HAVE_PCRE_LIB 0)
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-       string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATHLIBPCRE "${PATH_PCRE_LIB}")
-       string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-       string(REGEX MATCH "-L${PATHLIBPCRE} " operation "${CMAKE_C_FLAGS}")
-	   if(NOT operation)
-			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${PATHLIBPCRE} ")
-	   endif(NOT operation)
-	   string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-	   if(NOT operation)
-			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-	   endif(NOT operation)	   
-       set(HAVE_PCRE_LIB 1)
-else(PATH_PCRE_LIB)
-		message("You should install libpcre (please install the libpcre3-dev package or equivalent)")
-endif(PATH_PCRE_LIB AND PATH_PCRE_H)
-
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 
@@ -239,7 +124,7 @@ if(pthread)
 	### HAVE_SEM_INIT
   	
   	if(HAVE_SEM_INIT_LIB)
-		exec_program("${CMAKE_C_COMPILER} -lpthread ${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c" OUTPUT_VARIABLE HAVE_SEM_INIT_run)
+		exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c" OUTPUT_VARIABLE HAVE_SEM_INIT_run)
 	    	if(HAVE_SEM_INIT_run)
 			set(HAVE_SEM_INIT 0)
 	    	else(HAVE_SEM_INIT_run)
@@ -250,7 +135,7 @@ if(pthread)
 	### HAVE_SEM_TIMEDWAIT
 
 	if(HAVE_SEM_TIMEDWAIT_LIB)
-		exec_program("${CMAKE_C_COMPILER} -lpthread ${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c" OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run)
+		exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c" OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run)
 		if(HAVE_SEM_TIMEDWAIT_run)
 			set(HAVE_SEM_TIMEDWAIT 0)
 		else(HAVE_SEM_TIMEDWAIT_run)
@@ -261,7 +146,7 @@ if(pthread)
 	### HAVE_MUTEX_TIMEDLOCK
 
 	if(HAVE_MUTEX_TIMEDLOCK_LIB)
-		exec_program("${CMAKE_C_COMPILER} -lpthread ${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c" OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run)
+		exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c" OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run)
 		if(HAVE_MUTEX_TIMEDLOCK_run)
 			set(HAVE_MUTEX_TIMEDLOCK 0)
 		else(HAVE_MUTEX_TIMEDLOCK_run)
@@ -278,10 +163,10 @@ endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 if(WIN32)
     if(__VISUALC__)
-	set(mcsc_flags "/D_XBT_WIN32 /I${PROJECT_DIRECTORY}/include/xbt /I${PROJECT_DIRECTORY}/src/xbt")
+	set(mcsc_flags "/D_XBT_WIN32 /I${CMAKE_HOME_DIRECTORY}/include/xbt /I${CMAKE_HOME_DIRECTORY}/src/xbt")
 	endif(__VISUALC__)
 	if(__GNUC__)
-		set(mcsc_flags "-D_XBT_WIN32 -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt")
+		set(mcsc_flags "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
 	endif(__GNUC__)
 endif(WIN32)
 
@@ -293,7 +178,7 @@ IF(CMAKE_CROSSCOMPILING)
 ELSE(CMAKE_CROSSCOMPILING)
 	try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
 		${simgrid_BINARY_DIR}
-		${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
+		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
 		COMPILE_DEFINITIONS "${mcsc_flags}"
 		OUTPUT_VARIABLE var_compil
 		)
@@ -320,88 +205,66 @@ if(mcsc MATCHES "no" AND pthread)
 	endif(HAVE_WINDOWS_H)
 endif(mcsc MATCHES "no" AND pthread)
 
-if(with_context MATCHES "ucontext" AND mcsc MATCHES "no")
-	message(FATAL_ERROR "-Dwith-context=ucontext specified but ucontext unusable.")
-endif(with_context MATCHES "ucontext" AND mcsc MATCHES "no")
+#Only windows
 
-set(with_context_ok 0)
-if(with_context MATCHES "windows")
-	set(with_context_ok 1)
+if(WIN32)
 	if(NOT HAVE_WINDOWS_H)
 		message(FATAL_ERROR "no appropriate backend found windows")
 	endif(NOT HAVE_WINDOWS_H)
-endif(with_context MATCHES "windows")
-
-if(with_context MATCHES "pthreads")
-	set(with_context_ok 1)
-	set(with_context "pthread")
-endif(with_context MATCHES "pthreads")
-
-if(with_context MATCHES "auto")
-	set(with_context_ok 1)
-	set(with_context "ucontext")
-	message("with_context auto change to ucontext")
-endif(with_context MATCHES "auto")
-
-if(with_context MATCHES "ucontext")
-	set(with_context_ok 1)
-	if(mcsc)
-		set(CONTEXT_UCONTEXT 1)
-	else(mcsc)
-		if(windows_context MATCHES "yes")
-			set(with_context "windows")
-			message("with_context ucontext change to windows")
-		else(windows_context MATCHES "yes")
-			set(with_context "pthread")
-			message("with_context ucontext change to pthread")
-		endif(windows_context MATCHES "yes")
-	endif(mcsc)
-endif(with_context MATCHES "ucontext")
-
-if(with_context MATCHES "pthread")
-	set(with_context_ok 1)
-	if(NOT pthread)
-		message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).")
-	endif(NOT pthread)
-	SET(CONTEXT_THREADS 1)
-endif(with_context MATCHES "pthread")
-
-if(with_context MATCHES "ucontext")
-	SET(CONTEXT_THREADS 0)
-endif(with_context MATCHES "ucontext")
-
-if(NOT with_context_ok)
-	message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread")
-endif(NOT with_context_ok)
+endif(WIN32)
+
+if(windows_context MATCHES "yes")
+	message(STATUS "Context change to windows")
+endif(windows_context MATCHES "yes")
+
+#If can have both context
+
+if(mcsc)
+	set(CONTEXT_UCONTEXT 1)
+endif(mcsc)
+
+if(pthread)
+	set(CONTEXT_THREADS 1)
+endif(pthread)
+
 
 ###############
 ## SVN version check
 ##
-if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn)
-	find_file(SVN ".svn" ${PROJECT_DIRECTORY})
-	exec_program("svnversion ${PROJECT_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION")
-	message("SVN_VERSION : ${SVN_VERSION}")
-endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn)
+if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
+	find_file(SVN ".svn" ${CMAKE_HOME_DIRECTORY})
+	exec_program("svnversion ${CMAKE_HOME_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION")
+	message(STATUS "svn version ${SVN_VERSION}")
+endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
 
-if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
+if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)
 
-	exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "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")
+	exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION")
+	exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
+	exec_program("git svn info" ${CMAKE_HOME_DIRECTORY} OUTPUT_VARIABLE "GIT_SVN_VERSION")
 	
 	string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-	string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
 	STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-	foreach(line ${GIT_SVN_VERSION})
-		string(REGEX MATCH "^Revision:.*" line_good ${line})
-		if(line_good)
-			string(REPLACE "Revision: " "" line_good ${line_good})
-			set(SVN_VERSION ${line_good})
-		endif(line_good)
-	endforeach(line ${GIT_SVN_VERSION})
-endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
+
+	exec_program("git config --get svn-remote.svn.url"
+		OUTPUT_VARIABLE url
+		RETURN_VALUE ret)
+	if(ret EQUAL 0)
+		exec_program("git svn info" ${CMAKE_HOME_DIRECTORY}
+			OUTPUT_VARIABLE "GIT_SVN_VERSION")
+		string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
+		foreach(line ${GIT_SVN_VERSION})
+			string(REGEX MATCH "^Revision:.*" line_good ${line})
+			if(line_good)
+				string(REPLACE "Revision: " ""
+					line_good ${line_good})
+				set(SVN_VERSION ${line_good})
+			endif(line_good)
+		endforeach(line ${GIT_SVN_VERSION})
+	endif(ret EQUAL 0)
+endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)
 
 ###################################
 ## SimGrid and GRAS specific checks
@@ -411,7 +274,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
 # Check architecture signature begin
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
 	${simgrid_BINARY_DIR}
-	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
+	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
 	RUN_OUTPUT_VARIABLE var1
 	)
 if(BIGENDIAN)
@@ -483,7 +346,7 @@ endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:")
 # Check architecture signature end
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
 	${simgrid_BINARY_DIR}
-	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
+	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
 	RUN_OUTPUT_VARIABLE var2
 	)
 separate_arguments(var2)
@@ -494,7 +357,7 @@ endforeach(var_tmp ${var2})
 # Check for [SIZEOF_MAX]
 try_run(RUN_SM_VAR COMPILE_SM_VAR
 	${simgrid_BINARY_DIR}
-	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
+	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
 	RUN_OUTPUT_VARIABLE var3
 	)
 SET(SIZEOF_MAX ${var3})
@@ -509,19 +372,18 @@ if(HAVE_MAKECONTEXT OR WIN32)
 		set(makecontext_CPPFLAGS_2 "-DOSX")
 	endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	
-    if(WIN32)
-        if(__VISUALC__)
-            set(makecontext_CPPFLAGS "/DTEST_makecontext")
-    	    set(makecontext_CPPFLAGS_2 "/D_XBT_WIN32 /I${PROJECT_DIRECTORY}/include/xbt /I${PROJECT_DIRECTORY}/src/xbt")
-    	endif(__VISUALC__)
-    	if(__GNUC__)
-    	    set(makecontext_CPPFLAGS "-DTEST_makecontext")
-    	    set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${PROJECT_DIRECTORY}/include/xbt -I${PROJECT_DIRECTORY}/src/xbt")
-    	endif(__GNUC__)
-    else(WIN32)
+    if(WIN32 AND __VISUALC__)
+        set(makecontext_CPPFLAGS "/DTEST_makecontext")
+	    set(makecontext_CPPFLAGS_2 "/D_XBT_WIN32 /I${CMAKE_HOME_DIRECTORY}/include/xbt /I${CMAKE_HOME_DIRECTORY}/src/xbt")
+	endif(WIN32 AND __VISUALC__)
+	if(WIN32 AND __GNUC__)
+	    set(makecontext_CPPFLAGS "-DTEST_makecontext")
+	    set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+	endif(WIN32 AND __GNUC__)
+	
 	try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
 		${simgrid_BINARY_DIR}
-		${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
+		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
 		COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
 		)
 	file(READ ${simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
@@ -532,7 +394,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
 	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})")
-    endif(WIN32)
+	
 endif(HAVE_MAKECONTEXT OR WIN32)
 
 #--------------------------------------------------------------------------------------------------
@@ -541,7 +403,7 @@ endif(HAVE_MAKECONTEXT OR WIN32)
 if (NOT CMAKE_CROSSCOMPILING)
 	try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
 		${simgrid_BINARY_DIR}
-		${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
+		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
 		)
 file(READ "${simgrid_BINARY_DIR}/conftestval" stack)
 if(stack MATCHES "down")
@@ -566,7 +428,7 @@ endif(NOT CMAKE_CROSSCOMPILING)
 #AC_PRINTF_NULL
 try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR
 	${simgrid_BINARY_DIR}
-	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
+	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
 	)
 
 if(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
@@ -588,7 +450,7 @@ set(diff_va "va_copy((d),(s))"
 )
 
 foreach(fct ${diff_va})
-	write_file("${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>
+	write_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>
 	#include <stdarg.h>
 	#include <string.h>
 	#define DO_VA_COPY(d,s) ${fct}
@@ -619,7 +481,7 @@ foreach(fct ${diff_va})
 	)
 	try_compile(COMPILE_VA_NULL_VAR
 	${simgrid_BINARY_DIR}
-	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
+	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
 	)
 	if(COMPILE_VA_NULL_VAR)
 		string(REGEX REPLACE "\;" "" fctbis ${fct})
@@ -677,7 +539,7 @@ endforeach(fct ${diff_va})
 ### check for getline
 try_compile(COMPILE_RESULT_VAR
 	${simgrid_BINARY_DIR}
-	${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
+	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
 	)
 
 if(NOT COMPILE_RESULT_VAR)
@@ -701,7 +563,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
 	else(CMAKE_CROSSCOMPILING)
   	    try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
 	  	${simgrid_BINARY_DIR}
-		${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
+		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
 	    )	
 	endif(CMAKE_CROSSCOMPILING)
 
@@ -711,7 +573,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
 	else(CMAKE_CROSSCOMPILING)
   	   try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
 		${simgrid_BINARY_DIR}
-		${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
+		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
 	   )
 	endif(CMAKE_CROSSCOMPILING)
 	
@@ -750,28 +612,32 @@ endif(ADDR2LINE)
 
 ### File to create
 
-configure_file("${PROJECT_DIRECTORY}/src/context_sysv_config.h.in" 			"${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in" 			"${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/gras_config.h.in" 	"${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/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}/include/simgrid_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" 		"${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)
 
-set(top_srcdir "${PROJECT_DIRECTORY}")
-set(srcdir "${PROJECT_DIRECTORY}/src")
+set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
+set(srcdir "${CMAKE_HOME_DIRECTORY}/src")
 
-set(exec_prefix ${prefix})
-set(includedir ${prefix}/include)
-set(top_builddir ${PROJECT_DIRECTORY})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+set(top_builddir ${CMAKE_HOME_DIRECTORY})
 set(libdir ${exec_prefix}/lib)
 set(CMAKE_LINKARGS "${CMAKE_CURRENT_BINARY_DIR}/lib")
-set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/lib:${gtnets_path}/lib:$LD_LIBRARY_PATH")
+set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/lib:${GTNETS_LIB_PATH}:$LD_LIBRARY_PATH")
 
-configure_file(${PROJECT_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc @ONLY)
-configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun @ONLY)
-configure_file(${PROJECT_DIRECTORY}/examples/smpi/hostfile ${CMAKE_CURRENT_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
-configure_file(${PROJECT_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
-configure_file(${PROJECT_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpif2c @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpiff @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun @ONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/hostfile ${CMAKE_CURRENT_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
+configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_CURRENT_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
 
 exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE OKITOKI)
+exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI)
+exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI)
 exec_program("chmod a=rwx ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI)