X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71bcc9e07bd5799094b328f6dce1620efb40fdf5..d017fd12687c369472dcf384ec740e35f1b6cdfb:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index a9bf4eaa3f..1f422e1332 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -294,14 +294,14 @@ IF(CMAKE_CROSSCOMPILING)
 	ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
 	try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
-		${simgrid_BINARY_DIR}
+		${PROJECT_BINARY_DIR}
 		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
 		COMPILE_DEFINITIONS "${mcsc_flags}"
 		OUTPUT_VARIABLE var_compil
 		)
 		
-		if(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
-			file(READ "${simgrid_BINARY_DIR}/conftestval" mcsc)
+		if(EXISTS "${PROJECT_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
+			file(READ "${PROJECT_BINARY_DIR}/conftestval" mcsc)
 			STRING(REPLACE "\n" "" mcsc "${mcsc}")
 			if(mcsc)
    				set(mcsc "yes")
@@ -309,9 +309,9 @@ ELSE(CMAKE_CROSSCOMPILING)
 			else(mcsc)
 				set(mcsc "no")
 			endif(mcsc)
-	    else(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
+	    else(EXISTS "${PROJECT_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
 			set(mcsc "no")
-		endif(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
+		endif(EXISTS "${PROJECT_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
 ENDIF(CMAKE_CROSSCOMPILING)
 
 if(mcsc MATCHES "no" AND pthread)
@@ -349,8 +349,8 @@ endif(pthread)
 ###############
 ## SVN version check
 ##
-if(EXISTS .git)
-exec_program("git remote" OUTPUT_VARIABLE remote RETURN_VALUE ret)
+if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
+exec_program("git remote | head -n 1" OUTPUT_VARIABLE remote RETURN_VALUE ret)
 exec_program("git config --get remote.${remote}.url" OUTPUT_VARIABLE url RETURN_VALUE ret)
 
 if(url)
@@ -363,7 +363,7 @@ if(url)
 	STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
 endif(url)
-endif(EXISTS .git)
+endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
 
 ###################################
 ## SimGrid and GRAS specific checks
@@ -372,7 +372,7 @@ endif(EXISTS .git)
 IF(NOT CMAKE_CROSSCOMPILING)
 # Check architecture signature begin
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
-	${simgrid_BINARY_DIR}
+	${PROJECT_BINARY_DIR}
 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
 	RUN_OUTPUT_VARIABLE var1
 	)
@@ -483,7 +483,7 @@ endif(GRAS_THISARCH MATCHES "none")
 
 # Check architecture signature end
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
-	${simgrid_BINARY_DIR}
+	${PROJECT_BINARY_DIR}
 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
 	RUN_OUTPUT_VARIABLE var2
 	)
@@ -494,7 +494,7 @@ endforeach(var_tmp ${var2})
 
 # Check for [SIZEOF_MAX]
 try_run(RUN_SM_VAR COMPILE_SM_VAR
-	${simgrid_BINARY_DIR}
+	${PROJECT_BINARY_DIR}
 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
 	RUN_OUTPUT_VARIABLE var3
 	)
@@ -520,11 +520,11 @@ if(HAVE_MAKECONTEXT OR WIN32)
 	endif(WIN32 AND __GNUC__)
 	
 	try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
-		${simgrid_BINARY_DIR}
+		${PROJECT_BINARY_DIR}
 		${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)
+	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}")
@@ -540,10 +540,10 @@ endif(HAVE_MAKECONTEXT OR WIN32)
 ### check for stackgrowth
 if (NOT CMAKE_CROSSCOMPILING)
 	try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
-		${simgrid_BINARY_DIR}
+		${PROJECT_BINARY_DIR}
 		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
 		)
-file(READ "${simgrid_BINARY_DIR}/conftestval" stack)
+file(READ "${PROJECT_BINARY_DIR}/conftestval" stack)
 if(stack MATCHES "down")
 	set(PTH_STACKGROWTH "-1")
 endif(stack MATCHES "down")
@@ -565,7 +565,7 @@ endif(NOT CMAKE_CROSSCOMPILING)
 
 #AC_PRINTF_NULL
 try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR
-	${simgrid_BINARY_DIR}
+	${PROJECT_BINARY_DIR}
 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
 	)
 
@@ -618,7 +618,7 @@ foreach(fct ${diff_va})
 	}"
 	)
 	try_compile(COMPILE_VA_NULL_VAR
-	${simgrid_BINARY_DIR}
+	${PROJECT_BINARY_DIR}
 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
 	)
 	if(COMPILE_VA_NULL_VAR)
@@ -676,7 +676,7 @@ endforeach(fct ${diff_va})
 #--------------------------------------------------------------------------------------------------
 ### check for getline
 try_compile(COMPILE_RESULT_VAR
-	${simgrid_BINARY_DIR}
+	${PROJECT_BINARY_DIR}
 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
 	)
 
@@ -700,7 +700,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
 		#set(PREFER_PORTABLE_SNPRINTF 1)
 	else(CMAKE_CROSSCOMPILING)
   	    try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
-	  	${simgrid_BINARY_DIR}
+	  	${PROJECT_BINARY_DIR}
 		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
 	    )	
 	endif(CMAKE_CROSSCOMPILING)
@@ -710,7 +710,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
 		set(PREFER_PORTABLE_VSNPRINTF 1)
 	else(CMAKE_CROSSCOMPILING)
   	   try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
-		${simgrid_BINARY_DIR}
+		${PROJECT_BINARY_DIR}
 		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
 	   )
 	endif(CMAKE_CROSSCOMPILING)