From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 3 Dec 2010 18:21:16 +0000 (+0000)
Subject: Remove gtnets_path. Now use a module.
X-Git-Tag: v3.6_beta2~941
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5bfb48696ec0427d665778489651cfaa90646630?hp=a46b3e6c423da020937c547ab7983925e4b589e0

Remove gtnets_path. Now use a module.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8981 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index a56f753b1d..e4b2c7cae4 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -682,7 +682,7 @@ 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(${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)
diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 0fa1010563..2e6d0cea00 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -211,7 +211,6 @@ if(HAVE_MC)
 endif(HAVE_MC)
 
 if(HAVE_GTNETS)
-	add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
 	add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)
 endif(HAVE_GTNETS)
 
diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExeLibWin.cmake
index 028909dd34..62f342dc38 100644
--- a/buildtools/Cmake/MakeExeLibWin.cmake
+++ b/buildtools/Cmake/MakeExeLibWin.cmake
@@ -90,7 +90,6 @@ if(HAVE_MC)
 endif(HAVE_MC)
 
 if(HAVE_GTNETS)
-	add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
 	add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)
 endif(HAVE_GTNETS)
 
diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 1081c590f9..4959732df4 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -59,7 +59,6 @@ mark_as_advanced(HAVE_RSYNC)
 mark_as_advanced(BIBTEX2HTML_PATH)
 mark_as_advanced(RUBY_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(RUBY_LIB_PATH_2)
-mark_as_advanced(CLEAR gtnets_path)
 mark_as_advanced(BUILDNAME)
 mark_as_advanced(ADDR2LINE)
 mark_as_advanced(BIBTOOL_PATH)
diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh
index 229320c81c..9938a78cce 100644
--- a/buildtools/pipol/Experimental_all_simgrid_gt.sh
+++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh
@@ -71,7 +71,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -94,7 +93,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -169,7 +167,6 @@ if [ $SYSTEM = Linux ] ; then
 		-Denable_tracing=on \
 		-Denable_latency_bound_tracking=on \
 		-Denable_gtnets=on \
-		-Dgtnets_path=/usr \
 		-Denable_java=on \
 		-Dwith_context=auto \
 		-Denable_smpi=on .
@@ -190,7 +187,6 @@ if [ $SYSTEM = Linux ] ; then
 	-Denable_tracing=on \
 	-Denable_latency_bound_tracking=on \
 	-Denable_gtnets=off \
-	-Dgtnets_path=/usr \
 	-Denable_java=on \
 	-Dwith_context=auto \
 	-Denable_compile_optimizations=on \
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 382d89a04c..45dc876c9c 100644
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -90,7 +90,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_smpi=on .
@@ -110,7 +109,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=on \
@@ -132,7 +130,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -155,7 +152,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -222,7 +218,7 @@ if [ $SYSTEM = Linux ] ; then
 	
 	if [ -e $userhome/usr/lib/libgtsim-opt.so ] ; then
 		#Make gtnets
-		cmake -Denable_supernovae=off -Denable_compile_warnings=off -Denable_compile_optimizations=off -Dgtnets_path=$absolute_path/usr ./
+		cmake -Denable_supernovae=off -Denable_compile_warnings=off -Denable_compile_optimizations=off ./
 		ctest -D NightlyStart
 		ctest -D NightlyConfigure
 		ctest -D NightlyBuild
diff --git a/buildtools/pipol/no_test.sh b/buildtools/pipol/no_test.sh
index 48c138b431..3e0dc2aee6 100644
--- a/buildtools/pipol/no_test.sh
+++ b/buildtools/pipol/no_test.sh
@@ -40,7 +40,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_smpi=on . 2>&1 | grep -i 'BUILDNAME'
@@ -54,7 +53,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=on \
@@ -70,7 +68,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -87,7 +84,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -104,7 +100,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
diff --git a/buildtools/pipol/test_all.sh b/buildtools/pipol/test_all.sh
index 1ac49accf3..d3b1f2bb19 100644
--- a/buildtools/pipol/test_all.sh
+++ b/buildtools/pipol/test_all.sh
@@ -51,7 +51,6 @@ if [ `uname` != Darwin ]
 	-Denable_tracing=on \
 	-Denable_latency_bound_tracking=on \
 	-Denable_gtnets=on \
-	-Dgtnets_path=/usr \
 	-Denable_java=on \
 	-Dwith_context=auto \
 	-Denable_smpi=on .
@@ -71,7 +70,6 @@ if [ `uname` != Darwin ]
 	-Denable_tracing=on \
 	-Denable_latency_bound_tracking=on \
 	-Denable_gtnets=off \
-	-Dgtnets_path=/usr \
 	-Denable_java=on \
 	-Dwith_context=auto \
 	-Denable_compile_optimizations=on \
@@ -94,7 +92,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -117,7 +114,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \