Changeset 1467 for trunk/Cbc


Ignore:
Timestamp:
Jun 9, 2010 8:13:31 PM (9 years ago)
Author:
lou
Message:

Fix incorrect library order for osiUnitTest.

Location:
trunk/Cbc/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/Makefile.am

    r1464 r1467  
    116116osiUnitTest_SOURCES = osiUnitTest.cpp OsiCbcSolverInterfaceTest.cpp
    117117
    118 osiUnitTest_LDADD = ../src/libCbc.la ../src/OsiCbc/libOsiCbc.la $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     118osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
     119    $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
    119120
    120121AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
  • trunk/Cbc/test/Makefile.in

    r1466 r1467  
    104104        OsiCbcSolverInterfaceTest.$(OBJEXT)
    105105osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
    106 osiUnitTest_DEPENDENCIES = ../src/libCbc.la ../src/OsiCbc/libOsiCbc.la \
     106osiUnitTest_DEPENDENCIES = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    107107        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    108108        $(am__DEPENDENCIES_1)
     
    385385########################################################################
    386386osiUnitTest_SOURCES = osiUnitTest.cpp OsiCbcSolverInterfaceTest.cpp
    387 osiUnitTest_LDADD = ../src/libCbc.la ../src/OsiCbc/libOsiCbc.la $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     387osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
     388    $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     389
    388390
    389391########################################################################
Note: See TracChangeset for help on using the changeset viewer.