X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c65ff5979a62afebf471c8121b8d95ca383be32c..621dc12489b36a845b3ae4f578011067552cc7b4:/buildtools/pipol/liste_install.sh?ds=inline

diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh
index e96145d4c8..38fbde3b97 100644
--- a/buildtools/pipol/liste_install.sh
+++ b/buildtools/pipol/liste_install.sh
@@ -11,6 +11,7 @@ if [ -e /usr/bin/apt-get ] ; then
     sudo apt-get -y install liblua5.1-dev lua5.1
     sudo apt-get -y install ruby1.8-dev ruby
     sudo apt-get -y install unzip
+    sudo apt-get -y remove cmake
     sudo apt-get -y install cmake
     sudo apt-get -y install wget
 fi
@@ -24,6 +25,7 @@ if [ -e /usr/bin/yum ] ; then
     sudo yum -y install lua-devel lua
     sudo yum -y install ruby-devel ruby
     sudo yum -y install unzip
+    sudo yum -y remove cmake
     sudo yum -y install cmake
     sudo yum -y install wget
 fi
@@ -36,6 +38,7 @@ if [ x$arch = xDarwin ] ; then
     sudo fink -y install lua51-dev lua51
     sudo fink -y install ruby18-dev ruby
     sudo fink -y install unzip
+    sudo fink -y remove cmake
     sudo fink -y install cmake
     sudo fink -y install wget
 fi
@@ -66,27 +69,29 @@ which_ctest_version=`ctest --version`
 echo "current version of cmake : $which_cmake_version"
 echo "current version of cpack : $which_cpack_version"
 echo "current version of ctest : $which_ctest_version"
-if [ "x$which_cmake_version" != "xcmake version 2.8.1" ] ; then
-	if [ "x$which_cmake_version" != "xcmake version 2.8.2" ] ; then
-		which_cmake=`which cmake`
-		which_cpack=`which cpack`
-		which_ctest=`which ctest`
-		wget http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz
-		if [ -e ./cmake-2.8.2.tar.gz ]
-			tar zxvf cmake-2.8.2.tar.gz > /dev/null
-			cd ./cmake-2.8*/
-			cmake .	> /dev/null
-			make -j > /dev/null 2>&1
-			sudo ln -sf `pwd`/bin/cmake $which_cmake
-			sudo ln -sf `pwd`/bin/cpack $which_cpack
-			sudo ln -sf `pwd`/bin/ctest $which_ctest
+if [ "x$which_cmake_version" != "xcmake version 2.8.0" ] ; then
+	if [ "x$which_cmake_version" != "xcmake version 2.8.1" ] ; then
+		if [ "x$which_cmake_version" != "xcmake version 2.8.2" ] ; then
+			which_cmake=`which cmake`
+			which_cpack=`which cpack`
+			which_ctest=`which ctest`
+			wget http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz
+			if [ -e ./cmake-2.8.2.tar.gz ] ; then
+				tar zxvf cmake-2.8.2.tar.gz
+				cd ./cmake-2.8.2/
+				cmake .
+				make -j
+				sudo ln -sf `pwd`/bin/cmake $which_cmake
+				sudo ln -sf `pwd`/bin/cpack $which_cpack
+				sudo ln -sf `pwd`/bin/ctest $which_ctest
+			fi
+			which_cmake_version=`cmake --version`
+			which_cpack_version=`cpack --version`
+			which_ctest_version=`ctest --version`
+			echo "new version of cmake : $which_cmake_version"
+			echo "new version of cpack : $which_cpack_version"
+			echo "new version of ctest : $which_ctest_version"
+			cd ..
 		fi
-		which_cmake_version=`cmake --version`
-		which_cpack_version=`cpack --version`
-		which_ctest_version=`ctest --version`
-		echo "new version of cmake : $which_cmake_version"
-		echo "new version of cpack : $which_cpack_version"
-		echo "new version of ctest : $which_ctest_version"
-		cd ..
 	fi
 fi
\ No newline at end of file