X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9328039d9138a7469d34838e41334d831a3788f2..ce25317042935b2621bf84d5fcb79d9368d14234:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 1327d3e121..88751cdd51 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -41,6 +41,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("stdio.h" HAVE_STDIO_H)
 
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP)
@@ -87,14 +88,12 @@ if(enable_lua)
 		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 "-L${path_lua_to_use}" operation "${CMAKE_EXE_LINKER_FLAGS}")
-		string(REGEX MATCH ".*lua.*" operation2 "${path_lua}")
-		if(NOT operation AND operation2)
+		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}")			
-			SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-L${path_lua_to_use} ")
-		endif(NOT operation AND operation2)
+		endif(operation)
 		endforeach(path_lua ${LUA_LIBRARIES})
 	else(LUA51_FOUND)
 		message("Lua binding need version 5.1 and cmake version 2.8")
@@ -112,7 +111,6 @@ if(enable_ruby)
 				set(RUBY_LIBRARY_NAME ruby)
 			endif(NOT RUBY_LIBRARY_NAME)
 			string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
-			SET(CMAKE_EXE_LINKER_FLAGS "-L${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)
@@ -166,11 +164,11 @@ else(NOT enable_gtnets OR enable_supernovae)
 		SET(HAVE_GTNETS 0)
 	else(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}${GTNETS_CPPFLAGS} ")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${GTNETS_CPPFLAGS} ")
-		string(REGEX MATCH "${GTNETS_LDFLAGS}" operation "${CMAKE_EXE_LINKER_FLAGS}")
+		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)
-		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}${GTNETS_LDFLAGS} ")
+			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)
@@ -183,12 +181,7 @@ 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 "-L${lib_cgraph} " operation "${CMAKE_EXE_LINKER_FLAGS}")
-	if(NOT operation)
-		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-L${lib_cgraph} ")
-	endif(NOT operation)
-	
+		
 	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} ")
@@ -719,6 +712,7 @@ set(includedir ${prefix}/include)
 set(top_builddir ${PROJECT_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")
 
 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)