Changeset 32243 for gs2-extensions/xpdf-tools

Timestamp:

2018-07-06T16:59:09+12:00 (6 years ago)

Author:

sjm84

Message:

Moving from CMake 3.11.4 to 3.9.6 because of an incompatibility with the installed version of g++ and the newer version of CMake on both Linux LSB and the Mac Mountain Lion machine. CMake 3.11.4 requires a newer verrsion of g++.

Location:

gs2-extensions/xpdf-tools/trunk/src

Files:

• move-cmake.sh (modified) (4 diffs)
• packages/CASCADE-MAKE/CMAKE.sh (modified) (1 diff)
• packages/cmake-3.9.6.tar.gz (added)

gs2-extensions/xpdf-tools/trunk/src/move-cmake.sh

@@ -24 +24 @@
 installed=$GEXTXPDFTOOLS_INSTALLED
 develdir=$GEXT_XPDFTOOLS/devel/$GSDLOS
-
+#cmake_version="cmake-3.11"
+cmake_version="cmake-3.9"
 
 if [ "x$1" == "xaway" ]; then
@@ -41 +42 @@
     # If future-proofing, just move the cmake subfolder of doc
     #mkdir -p $develdir/doc
-    #mv $installed/doc/cmake-3.11 $develdir/doc/.
+    #mv $installed/doc/$cmake_version $develdir/doc/.
     if [ -d $develdir/doc ]; then
         rm -rf $develdir/doc
@@ -52 +53 @@
     fi
     mkdir -p $develdir/share/aclocal
-    mv $installed/share/cmake-3.11 $develdir/share/.
+    mv $installed/share/$cmake_version $develdir/share/.
     mv $installed/share/aclocal/cmake.m4 $develdir/share/aclocal/.
 
@@ -71 +72 @@
 
     #if [ -e $develdir/share/aclocal/cmake.m4 ]; then
-    mv $develdir/share/cmake-3.11 $installed/share/.
+    mv $develdir/share/$cmake_version $installed/share/.
     mv $develdir/share/aclocal/cmake.m4 $installed/share/aclocal/.
     #fi

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

@@ -2 +2 @@
 
 package=cmake
-version=-3.11.4
+#version=-3.11.4
+version=-3.9.6
 
 progname=$0