Cosmetics.

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

diff --git a/buildtools/Cmake/Pipol.cmake b/buildtools/Cmake/Pipol.cmake
index e575533..15cfe23 100644 (file)
--- a/buildtools/Cmake/Pipol.cmake
+++ b/buildtools/Cmake/Pipol.cmake
@@ -97,7 +97,6 @@ IF(pipol_user)
                                \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \;
                                cd ${CMAKE_HOME_DIRECTORY} \;
                                sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \;
-                               perl ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/cmake.pl \;
                                cmake -E remove CMakeCache.txt \;
                                cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \;
                                make clean \;
@@ -112,7 +111,6 @@ IF(pipol_user)
                                \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \;
                                cd ${CMAKE_HOME_DIRECTORY} \;
                                sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \;
-                               perl ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/cmake.pl \;
                                cmake -E remove CMakeCache.txt \;
                                cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \;
                                ctest -D Experimental \"
@@ -129,7 +127,6 @@ IF(pipol_user)
                                        \"sudo chown ${pipol_user} ${CMAKE_HOME_DIRECTORY} \;
                                        cd ${CMAKE_HOME_DIRECTORY} \;
                                        sh ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/liste_install.sh \;
-                                       perl ${CMAKE_HOME_DIRECTORY}/buildtools/pipol/cmake.pl \;
                                        cmake -E remove CMakeCache.txt \;
                                        cmake ${CMAKE_HOME_DIRECTORY}${CMAKE_OPTIONS} \;
                                        ctest -D Experimental \"

diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh
index 9af267b..75d7acf 100644 (file)
--- a/buildtools/pipol/liste_install.sh
+++ b/buildtools/pipol/liste_install.sh
@@ -15,6 +15,7 @@ if [ -e /usr/bin/apt-get ] ; then
     sudo apt-get -y install wget
     sudo apt-get -y install perl
     sudo apt-get -y install graphviz-dev graphviz
+    sudo apt-get -y install libpcre3-dev
 fi
 
 if [ -e /usr/bin/yum ] ; then
@@ -30,6 +31,7 @@ if [ -e /usr/bin/yum ] ; then
     sudo yum -y install wget
     sudo yum -y install perl
     sudo yum -y install graphviz-dev graphviz
+    sudo yum -y install libpcre3-dev
 fi
 
 if [ x$arch = xDarwin ] ; then
@@ -44,6 +46,7 @@ if [ x$arch = xDarwin ] ; then
     sudo fink -y install wget
     sudo fink -y install perl
     sudo fink -y install graphviz-dev graphviz
+    sudo fink -y install libpcre3-dev
 fi
 
 which_svn=`which svn`          #svn necessary
@@ -57,6 +60,7 @@ which_cmake=`which cmake`     #cmake necessary
 which_unzip=`which unzip`      #unzip for gtnets
 which_wget=`which wget`                #wget for cmake
 which_dot=`which dot`          #dot for cgraph
+which_perl=`which perl`                #perl
 echo $which_cmake
 echo $which_unzip
 echo $which_ruby
@@ -67,4 +71,10 @@ echo $which_gcc
 echo $which_gpp
 echo $which_svn
 echo $which_dot
-echo $which_wget
\ No newline at end of file
+echo $which_wget
+echo $which_perl
+
+directory=`pwd`
+cd ../
+perl $directory/buildtools/pipol/cmake.pl
+cd $directory
\ No newline at end of file