Changeset 28868 for main/trunk/greenstone2

Timestamp:

2014-03-04T15:10:09+13:00 (10 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:

• CMAKE.sh (modified) (2 diffs)
• CURL.sh (modified) (2 diffs)
• ZLIB.sh (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/CMAKE.sh

@@ -11 +11 @@
 
 # else, configure, make, make install
-
-cxxflags="-I$installdir -I$installdir/include" 
-ldflags="-L$installdir/lib"
+# First need to set the C/CXX/LD FLAGS for configuring (and compiling)
+export CFLAGS="-I$prefix -I$prefix/include"
+export CXXFLAGS=$CFLAGS
+export LDFLAGS="-L$prefix/lib"
 
 # configure, but only if we haven't already
@@ -24 +25 @@
 
 # make
-CXXFLAGS=$cxxflags LDFLAGS=$ldflags make
+make
 if [ $? != 0 ] ; then
-    echo "Error encountered making $d"
+    echo "Error encountered making $0"
     exit 1
 fi
 
 # make install
-CXXFLAGS=$cxxflags LDFLAGS=$ldflags make install
+make install
 if [ $? != 0 ] ; then
-    echo "Error encountered when installing $d"
+    echo "Error encountered when installing $0"
     exit 1
 fi
 
+export CFLAGS=
+export CXXFLAGS=
+export LDFLAGS=
+
 cd $securitydir

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/CURL.sh

@@ -26 +26 @@
 make
 if [ $? != 0 ] ; then
-    echo "Error encountered making $d"
+    echo "Error encountered making $0"
     exit 1
 fi
@@ -33 +33 @@
 make install
 if [ $? != 0 ] ; then
-    echo "Error encountered when installing $d"
+    echo "Error encountered when installing $0"
     exit 1
 fi

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/ZLIB.sh

@@ -19 +19 @@
 
 if [ $? != 0 ] ; then
-    echo "Error encountered when configuring $d"
+    echo "Error encountered when configuring $0"
     exit 1
 fi
@@ -26 +26 @@
 make
 if [ $? != 0 ] ; then
-    echo "Error encountered making $d"
+    echo "Error encountered making $0"
     exit 1
 fi
@@ -33 +33 @@
 make install
 if [ $? != 0 ] ; then
-    echo "Error encountered when installing $d"
+    echo "Error encountered when installing $0"
     exit 1
 fi