Changeset 2054 for trunk/Cbc


Ignore:
Timestamp:
Aug 8, 2014 12:07:42 AM (5 years ago)
Author:
mlubin
Message:

Force C++ linking for C interface test

Location:
trunk/Cbc/test
Files:
2 edited

Legend:

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

    r2016 r2054  
    9191
    9292CInterfaceTest_SOURCES = CInterfaceTest.c
     93nodist_EXTRA_CInterfaceTest_SOURCES = dummy.cpp # force using C++ linker
    9394
    9495CInterfaceTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
  • trunk/Cbc/test/Makefile.in

    r2016 r2054  
    9191CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    9292        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    93 SOURCES = $(CInterfaceTest_SOURCES) $(gamsTest_SOURCES) \
     93SOURCES = $(CInterfaceTest_SOURCES) \
     94        $(nodist_EXTRA_CInterfaceTest_SOURCES) $(gamsTest_SOURCES) \
    9495        $(osiUnitTest_SOURCES)
    9596DIST_SOURCES = $(CInterfaceTest_SOURCES) $(gamsTest_SOURCES) \
     
    454455########################################################################
    455456CInterfaceTest_SOURCES = CInterfaceTest.c
     457nodist_EXTRA_CInterfaceTest_SOURCES = dummy.cpp # force using C++ linker
    456458CInterfaceTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
    457459CInterfaceTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
     
    527529CInterfaceTest$(EXEEXT): $(CInterfaceTest_OBJECTS) $(CInterfaceTest_DEPENDENCIES)
    528530        @rm -f CInterfaceTest$(EXEEXT)
    529         $(LINK) $(CInterfaceTest_LDFLAGS) $(CInterfaceTest_OBJECTS) $(CInterfaceTest_LDADD) $(LIBS)
     531        $(CXXLINK) $(CInterfaceTest_LDFLAGS) $(CInterfaceTest_OBJECTS) $(CInterfaceTest_LDADD) $(LIBS)
    530532gamsTest$(EXEEXT): $(gamsTest_OBJECTS) $(gamsTest_DEPENDENCIES)
    531533        @rm -f gamsTest$(EXEEXT)
     
    543545@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CInterfaceTest.Po@am__quote@
    544546@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OsiCbcSolverInterfaceTest.Po@am__quote@
     547@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
    545548@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamsTest.Po@am__quote@
    546549@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiUnitTest.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.