X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/587fc1a190958ab7dbaaa3269e930e7776bd5b07..7dfc27c1d33a1b795f053b51dbc21b459ec0cfda:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index d9fd831056..63de957d67 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -14,9 +14,12 @@ include(TestBigEndian)
 TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
-if(enable_pcre)
+
+string(TOUPPER ${enable_pcre} enable_pcre)
+if(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
 include(FindPCRE)
-endif(enable_pcre)
+endif(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
+set(HAVE_GTNETS 0)
 if(enable_gtnets)	
 	include(FindGTnets)
 endif(enable_gtnets)
@@ -26,6 +29,10 @@ endif(enable_smpi)
 if(enable_lua)
 	include(FindLua51Simgrid)
 endif(enable_lua)
+set(HAVE_NS3 0)
+if(enable_ns3)
+	include(FindNS3)
+endif(enable_ns3)
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(pthread 	pthread_create 			"" pthread)
@@ -245,10 +252,13 @@ 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}")
+else(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
+	exec_program("git config --get svn-remote.svn.url"
+		OUTPUT_VARIABLE url
+		RETURN_VALUE ret)
 endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn)
 
-if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)
-
+if(url)
 	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")
 	
@@ -256,24 +266,20 @@ if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)
 	STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
+	
+	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(url)
 
-	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
@@ -636,7 +642,7 @@ set(includedir ${CMAKE_INSTALL_PREFIX}/include)
 set(top_builddir ${CMAKE_HOME_DIRECTORY})
 set(libdir ${exec_prefix}/lib)
 set(CMAKE_LINKARGS "${CMAKE_BINARY_DIR}/lib")
-set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:${GTNETS_LIB_PATH}:$LD_LIBRARY_PATH")
+set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:${GTNETS_LIB_PATH}:${HAVE_NS3_LIB}:$LD_LIBRARY_PATH")
 
 configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/smpif.h @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY)