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 a56f753..e4b2c7c 100644 (file)
--- 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(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)
 
 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 0fa1010..2e6d0ce 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -211,7 +211,6 @@ if(HAVE_MC)
 endif(HAVE_MC)
 
 if(HAVE_GTNETS)
 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)
 
        add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)
 endif(HAVE_GTNETS)
 

diff --git a/buildtools/Cmake/MakeExeLibWin.cmake b/buildtools/Cmake/MakeExeLibWin.cmake
index 028909d..62f342d 100644 (file)
--- a/buildtools/Cmake/MakeExeLibWin.cmake
+++ b/buildtools/Cmake/MakeExeLibWin.cmake
@@ -90,7 +90,6 @@ if(HAVE_MC)
 endif(HAVE_MC)\r
 \r
 if(HAVE_GTNETS)\r
 endif(HAVE_MC)\r
 \r
 if(HAVE_GTNETS)\r

-       add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")\r

        add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)\r
 endif(HAVE_GTNETS)\r
 \r
        add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)\r
 endif(HAVE_GTNETS)\r
 \r

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 1081c59..4959732 100644 (file)
--- 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(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)
 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 229320c..9938a78 100644 (file)
--- 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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 \
                -Denable_tracing=on \
                -Denable_latency_bound_tracking=on \
                -Denable_gtnets=on \

-               -Dgtnets_path=/usr \

                -Denable_java=on \
                -Dwith_context=auto \
                -Denable_smpi=on .
                -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 \
        -Denable_tracing=on \
        -Denable_latency_bound_tracking=on \
        -Denable_gtnets=off \

-       -Dgtnets_path=/usr \

        -Denable_java=on \
        -Dwith_context=auto \
        -Denable_compile_optimizations=on \
        -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 382d89a..45dc876 100644 (file)
--- 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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_smpi=on .
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=on \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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
        
        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
                ctest -D NightlyStart
                ctest -D NightlyConfigure
                ctest -D NightlyBuild

diff --git a/buildtools/pipol/no_test.sh b/buildtools/pipol/no_test.sh
index 48c138b..3e0dc2a 100644 (file)
--- 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 \
 -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'
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=on \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 1ac49ac..d3b1f2b 100644 (file)
--- 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 \
        -Denable_tracing=on \
        -Denable_latency_bound_tracking=on \
        -Denable_gtnets=on \

-       -Dgtnets_path=/usr \

        -Denable_java=on \
        -Dwith_context=auto \
        -Denable_smpi=on .
        -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 \
        -Denable_tracing=on \
        -Denable_latency_bound_tracking=on \
        -Denable_gtnets=off \

-       -Dgtnets_path=/usr \

        -Denable_java=on \
        -Dwith_context=auto \
        -Denable_compile_optimizations=on \
        -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -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 \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=on \

--Dgtnets_path=/usr \

 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \