Changeset 752


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/BSP/trunk/Cbc/configure

    r748 r752  
    28092809          xlc* | */xlc* | mpxlc* | */mpxlc*)
    28102810            coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    2811             coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036,1500-029"
     2811            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
    28122812            coin_dbg_cflags="-g"
    28132813          ;;
     
    36503650          xlC* | */xlC* | mpxlC* | */mpxlC*)
    36513651            coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    3652             coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036,1500-029"
     3652            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029"
    36533653            coin_dbg_cxxflags="-g"
    36543654            ;;
     
    2208622086
    2208722087
     22088# In this particular case we include the ASL in ADDLIBS, since currently
     22089# code in libCbc requires symbols from the ASL.  Later, when any AMPL code
     22090# is separated, this should go again.  NOTE: At that point, ASLLIB needs
     22091# to be used in Cbc/src/Makefile.am again (see comment there)
     22092ADDLIBS="$ASLLIB $ADDLIBS"
     22093
    2208822094#############################################################################
    2208922095#                       CbcGeneric configuration                            #
  • branches/BSP/trunk/Cbc/configure.ac

    r733 r752  
    8686# Ampl Solver library
    8787AC_COIN_HAS_ASL
     88
     89# In this particular case we include the ASL in ADDLIBS, since currently
     90# code in libCbc requires symbols from the ASL.  Later, when any AMPL code
     91# is separated, this should go again.  NOTE: At that point, ASLLIB needs
     92# to be used in Cbc/src/Makefile.am again (see comment there)
     93ADDLIBS="$ASLLIB $ADDLIBS"
    8894
    8995#############################################################################
  • branches/BSP/trunk/Cbc/src/Makefile.am

    r748 r752  
    1 # Copyright (C) 2006 International Business Machines and others.
     1# Copyright (C) 2006, 2007 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    8484# List all source files for this executable, including headers
    8585cbc_SOURCES = \
    86         CoinSolve.cpp \
    87         unitTestClp.cpp
     86        CoinSolve.cpp
    8887
    8988# Additional COIN libraries
  • branches/BSP/trunk/Cbc/src/Makefile.in

    r748 r752  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2006 International Business Machines and others.
     17# Copyright (C) 2006, 2007 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    172172binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    173173PROGRAMS = $(bin_PROGRAMS)
    174 am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp
    175 @COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) \
    176 @COIN_HAS_CLP_TRUE@     unitTestClp.$(OBJEXT)
     174am__cbc_SOURCES_DIST = CoinSolve.cpp
     175@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    177176cbc_OBJECTS = $(am_cbc_OBJECTS)
    178177am__DEPENDENCIES_1 =
     
    540539# List all source files for this executable, including headers
    541540@COIN_HAS_CLP_TRUE@cbc_SOURCES = \
    542 @COIN_HAS_CLP_TRUE@     CoinSolve.cpp \
    543 @COIN_HAS_CLP_TRUE@     unitTestClp.cpp
     541@COIN_HAS_CLP_TRUE@     CoinSolve.cpp
    544542
    545543
     
    779777@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
    780778@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Plo@am__quote@
    781 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@
    782779
    783780.cpp.o:
Note: See TracChangeset for help on using the changeset viewer.