Changeset 1575


Ignore:
Timestamp:
Jul 18, 2010 1:46:35 PM (11 years ago)
Author:
stefan
Message:

add Osi into Externals; fixes for building osiUnitTest when configured without pkg-config

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:externals

      •  

        old new  
        55Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
        66CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         7Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi

  • trunk/Clp/test/Makefile.am

    r1559 r1575  
    2121osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
    2222
    23 LIBS += $(COINUTILS_LIBS) $(OSITESTS_LIBS)
     23LIBS += $(COINUTILS_LIBS) $(OSI_LIBS) $(OSITESTS_LIBS)
    2424
    25 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSITESTS_CFLAGS) \
     25AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
    2626        -I`$(CYGPATH_W) $(srcdir)/../src` \
    2727        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`

  • trunk/Clp/test/Makefile.in

    r1573 r1575  
    4444host_triplet = @host@
    4545@COIN_HAS_OSITESTS_TRUE@noinst_PROGRAMS = osiUnitTest$(EXEEXT)
    46 @COIN_HAS_OSITESTS_TRUE@am__append_1 = $(COINUTILS_LIBS) $(OSITESTS_LIBS)
     46@COIN_HAS_OSITESTS_TRUE@am__append_1 = $(COINUTILS_LIBS) $(OSI_LIBS) $(OSITESTS_LIBS)
    4747@COIN_HAS_SAMPLE_TRUE@am__append_2 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
    4848@COIN_HAS_SAMPLE_TRUE@am__append_3 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
    … …  
    254254@COIN_HAS_OSITESTS_TRUE@osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
    255255@COIN_HAS_OSITESTS_TRUE@osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
    256 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSITESTS_CFLAGS) \
     256@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
    257257@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
    258258@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`

  • trunk/Externals

    r1559 r1575  
    55Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
    66CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
     7Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi
Note: See TracChangeset for help on using the changeset viewer.