Changeset 32243

Show
Ignore:
Timestamp:
06.07.2018 16:59:09 (3 months 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:
1 added
2 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/xpdf-tools/trunk/src/move-cmake.sh

    r32239 r32243  
    2424installed=$GEXTXPDFTOOLS_INSTALLED 
    2525develdir=$GEXT_XPDFTOOLS/devel/$GSDLOS 
    26  
     26#cmake_version="cmake-3.11" 
     27cmake_version="cmake-3.9" 
    2728 
    2829if [ "x$1" == "xaway" ]; then 
     
    4142    # If future-proofing, just move the cmake subfolder of doc 
    4243    #mkdir -p $develdir/doc 
    43     #mv $installed/doc/cmake-3.11 $develdir/doc/. 
     44    #mv $installed/doc/$cmake_version $develdir/doc/. 
    4445    if [ -d $develdir/doc ]; then 
    4546        rm -rf $develdir/doc 
     
    5253    fi 
    5354    mkdir -p $develdir/share/aclocal 
    54     mv $installed/share/cmake-3.11 $develdir/share/. 
     55    mv $installed/share/$cmake_version $develdir/share/. 
    5556    mv $installed/share/aclocal/cmake.m4 $develdir/share/aclocal/. 
    5657 
     
    7172 
    7273    #if [ -e $develdir/share/aclocal/cmake.m4 ]; then 
    73     mv $develdir/share/cmake-3.11 $installed/share/. 
     74    mv $develdir/share/$cmake_version $installed/share/. 
    7475    mv $develdir/share/aclocal/cmake.m4 $installed/share/aclocal/. 
    7576    #fi 
  • gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

    r32240 r32243  
    22 
    33package=cmake 
    4 version=-3.11.4 
     4#version=-3.11.4 
     5version=-3.9.6 
    56 
    67progname=$0