From e46031a520ebab2c65550e2eb12eed7a094f08e5 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Fri, 30 Mar 2012 14:54:32 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: cmake 2.8.4 -> 2.8.7

---
 config_CentOS_5.5_64bit.xml               |  4 ++--
 config_Debian_4.0.xml                     |  4 ++--
 config_Debian_4.0_64bit.xml               |  4 ++--
 config_Debian_5.0_64bit.xml               |  4 ++--
 config_Debian_6.0_64bit.xml               |  4 ++--
 config_Mandriva_2008.0.xml                |  4 ++--
 config_Mandriva_2008.0_64bit.xml          |  4 ++--
 config_Mandriva_2010.0.xml                |  4 ++--
 config_Mandriva_2010.0_64bit.xml          |  4 ++--
 config_Red_Hat_Enterprise_WS_4_64bit.xml  |  4 ++--
 config_Scientific_SL_5.1_64bit.xml        |  4 ++--
 config_files/{cmake-2.8.4.sh => cmake.sh} | 11 +++--------
 12 files changed, 25 insertions(+), 30 deletions(-)
 rename config_files/{cmake-2.8.4.sh => cmake.sh} (93%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 68ff431..fe29039 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="CentOS 5.5 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 81764e3..069bab3 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 4.0"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index cb7ae03..5961e09 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 4.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index e891149..93979dd 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 5.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index eac4461..9f6c1aa 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Debian 6.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index cff5942..6acb39e 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2008.0"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 46e4741..962ea8c 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2008.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index e80392a..01c96c1 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2010.0"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 389c260..eaf82dc 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Mandriva 2010.0 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 0db4b4c..0df401f 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 84b0c2e..da121d5 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -468,10 +468,10 @@
 	     type="prerequisite"
 	     description="The cross-platform, open-source make system">
       <installation os="Scientific SL 5.1 64bit"
-                    version="2.8.4" 
+                    version="2.8.7" 
 		    disable="false"
 		    installdiskspace="34168,23512,158888"
-		    script="cmake-2.8.4.sh"/>
+		    script="cmake.sh"/>
     </product>
     <product name="gl2ps"
 	     type="prerequisite"
diff --git a/config_files/cmake-2.8.4.sh b/config_files/cmake.sh
similarity index 93%
rename from config_files/cmake-2.8.4.sh
rename to config_files/cmake.sh
index 3b9e164..84a7b9f 100755
--- a/config_files/cmake-2.8.4.sh
+++ b/config_files/cmake.sh
@@ -1,18 +1,18 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : cmake-2.8.4.sh
+#  File      : cmake.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-CMAKE_VERSION=2.8.4
+CMAKE_VERSION=2.8.7
 
 check_version()
 {
@@ -70,11 +70,6 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 cd ${PRODUCT_SRC_DIR}
 
-chmod +w ./configure
-#INV - bug in a cmake configure 
-cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
-chmod 755 ./configure
-
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
-- 
2.39.2