Changeset 752

Timestamp:

Aug 14, 2007 3:02:01 PM (12 years ago)

Author:

andreasw

Message:

fixing linking issues with ASL (temporary fix)

Location:

branches/BSP/trunk/Cbc

Files:

• configure (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (4 diffs)

branches/BSP/trunk/Cbc/configure

@@ -2809 +2809 @@
           xlc* | */xlc* | mpxlc* | */mpxlc*)
             coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036,1500-029"
+            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
             coin_dbg_cflags="-g"
           ;;
@@ -3650 +3650 @@
           xlC* | */xlC* | mpxlC* | */mpxlC*)
             coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036,1500-029"
+            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029"
             coin_dbg_cxxflags="-g"
             ;;
@@ -22086 +22086 @@
 
 
+# In this particular case we include the ASL in ADDLIBS, since currently
+# code in libCbc requires symbols from the ASL.  Later, when any AMPL code
+# is separated, this should go again.  NOTE: At that point, ASLLIB needs
+# to be used in Cbc/src/Makefile.am again (see comment there)
+ADDLIBS="$ASLLIB $ADDLIBS"
+
 #############################################################################
 #                       CbcGeneric configuration                            #

branches/BSP/trunk/Cbc/configure.ac

@@ -86 +86 @@
 # Ampl Solver library
 AC_COIN_HAS_ASL
+
+# In this particular case we include the ASL in ADDLIBS, since currently
+# code in libCbc requires symbols from the ASL.  Later, when any AMPL code
+# is separated, this should go again.  NOTE: At that point, ASLLIB needs
+# to be used in Cbc/src/Makefile.am again (see comment there)
+ADDLIBS="$ASLLIB $ADDLIBS"
 
 #############################################################################

branches/BSP/trunk/Cbc/src/Makefile.am

@@ -1 @@
-# Copyright (C) 2006 International Business Machines and others.
+# Copyright (C) 2006, 2007 International Business Machines and others.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -84 +84 @@
 # List all source files for this executable, including headers
 cbc_SOURCES = \
-        CoinSolve.cpp \
-        unitTestClp.cpp
+        CoinSolve.cpp
 
 # Additional COIN libraries

branches/BSP/trunk/Cbc/src/Makefile.in

@@ -15 +15 @@
 @SET_MAKE@
 
-# Copyright (C) 2006 International Business Machines and others.
+# Copyright (C) 2006, 2007 International Business Machines and others.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -172 +172 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp
-@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) \
-@COIN_HAS_CLP_TRUE@     unitTestClp.$(OBJEXT)
+am__cbc_SOURCES_DIST = CoinSolve.cpp
+@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
 cbc_OBJECTS = $(am_cbc_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -540 +539 @@
 # List all source files for this executable, including headers
 @COIN_HAS_CLP_TRUE@cbc_SOURCES = \
-@COIN_HAS_CLP_TRUE@     CoinSolve.cpp \
-@COIN_HAS_CLP_TRUE@     unitTestClp.cpp
+@COIN_HAS_CLP_TRUE@     CoinSolve.cpp
 
 
@@ -779 +777 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@
 
 .cpp.o: