Changeset 28868

Show
Ignore:
Timestamp:
04.03.2014 15:10:09 (6 years ago)
Author:
ak19
Message:

Dr Bainbridge got CMake to compile. C/CXX/LD Flags need to be exported for CMAKE, and before the configure step.

Location:
main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/CMAKE.sh

    r28866 r28868  
    1111 
    1212# else, configure, make, make install 
    13  
    14 cxxflags="-I$installdir -I$installdir/include"  
    15 ldflags="-L$installdir/lib" 
     13# First need to set the C/CXX/LD FLAGS for configuring (and compiling) 
     14export CFLAGS="-I$prefix -I$prefix/include" 
     15export CXXFLAGS=$CFLAGS 
     16export LDFLAGS="-L$prefix/lib" 
    1617 
    1718# configure, but only if we haven't already 
     
    2425 
    2526# make 
    26 CXXFLAGS=$cxxflags LDFLAGS=$ldflags make 
     27make 
    2728if [ $? != 0 ] ; then 
    28     echo "Error encountered making $d" 
     29    echo "Error encountered making $0" 
    2930    exit 1 
    3031fi 
    3132 
    3233# make install 
    33 CXXFLAGS=$cxxflags LDFLAGS=$ldflags make install 
     34make install 
    3435if [ $? != 0 ] ; then 
    35     echo "Error encountered when installing $d" 
     36    echo "Error encountered when installing $0" 
    3637    exit 1 
    3738fi 
    3839 
     40export CFLAGS= 
     41export CXXFLAGS= 
     42export LDFLAGS= 
     43 
    3944cd $securitydir 
  • main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/CURL.sh

    r28867 r28868  
    2626make 
    2727if [ $? != 0 ] ; then 
    28     echo "Error encountered making $d" 
     28    echo "Error encountered making $0" 
    2929    exit 1 
    3030fi 
     
    3333make install 
    3434if [ $? != 0 ] ; then 
    35     echo "Error encountered when installing $d" 
     35    echo "Error encountered when installing $0" 
    3636    exit 1 
    3737fi 
  • main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/ZLIB.sh

    r28866 r28868  
    1919 
    2020if [ $? != 0 ] ; then 
    21     echo "Error encountered when configuring $d" 
     21    echo "Error encountered when configuring $0" 
    2222    exit 1 
    2323fi 
     
    2626make 
    2727if [ $? != 0 ] ; then 
    28     echo "Error encountered making $d" 
     28    echo "Error encountered making $0" 
    2929    exit 1 
    3030fi 
     
    3333make install 
    3434if [ $? != 0 ] ; then 
    35     echo "Error encountered when installing $d" 
     35    echo "Error encountered when installing $0" 
    3636    exit 1 
    3737fi