Changeset 2713 for ThirdParty/SCIP


Ignore:
Timestamp:
Apr 6, 2013 11:56:39 AM (7 years ago)
Author:
stefan
Message:

swap order of libs on linker line and include bitencode also into sciplpis lib (for static builds)

Location:
ThirdParty/SCIP/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/Makefile.am

    r2705 r2713  
    202202libcoinsciplpis_la_SOURCES = lpiswitch.c lpiswitch_init.cpp lpiswitch_none.c
    203203if COIN_HAS_SOPLEX
     204  # for static builds, we need bitencode also in the lpis library,
     205  # because it is listed after the scip lib on the linker line but
     206  # has functions that only lpi_spx is using
     207  libcoinsciplpis_la_SOURCES += scip/src/scip/bitencode.c
    204208  libcoinsciplpis_la_SOURCES += lpiswitch_spx.cpp
    205209endif 
  • ThirdParty/SCIP/trunk/Makefile.in

    r2705 r2713  
    5353build_triplet = @build@
    5454host_triplet = @host@
    55 @COIN_HAS_SOPLEX_TRUE@am__append_1 = lpiswitch_spx.cpp
     55@COIN_HAS_SOPLEX_TRUE@am__append_1 = scip/src/scip/bitencode.c \
     56@COIN_HAS_SOPLEX_TRUE@  lpiswitch_spx.cpp
    5657@COIN_HAS_CLP_TRUE@am__append_2 = lpiswitch_clp.cpp
    5758@COIN_HAS_CPX_TRUE@am__append_3 = lpiswitch_cpx.c
     
    268269libcoinsciplpis_la_LIBADD =
    269270am__libcoinsciplpis_la_SOURCES_DIST = lpiswitch.c lpiswitch_init.cpp \
    270         lpiswitch_none.c lpiswitch_spx.cpp lpiswitch_clp.cpp \
    271         lpiswitch_cpx.c lpiswitch_msk.c lpiswitch_xprs.c \
    272         lpiswitch_grb.c lpiswitch_qso.c
    273 @COIN_HAS_SOPLEX_TRUE@am__objects_3 = lpiswitch_spx.lo
     271        lpiswitch_none.c scip/src/scip/bitencode.c lpiswitch_spx.cpp \
     272        lpiswitch_clp.cpp lpiswitch_cpx.c lpiswitch_msk.c \
     273        lpiswitch_xprs.c lpiswitch_grb.c lpiswitch_qso.c
     274@COIN_HAS_SOPLEX_TRUE@am__objects_3 = bitencode.lo lpiswitch_spx.lo
    274275@COIN_HAS_CLP_TRUE@am__objects_4 = lpiswitch_clp.lo
    275276@COIN_HAS_CPX_TRUE@am__objects_5 = lpiswitch_cpx.lo
     
    29052906        uninstall-thirdpartyscipincludeHEADERS
    29062907
     2908@COIN_HAS_SOPLEX_TRUE@  # for static builds, we need bitencode also in the lpis library,
     2909@COIN_HAS_SOPLEX_TRUE@  # because it is listed after the scip lib on the linker line but
     2910@COIN_HAS_SOPLEX_TRUE@  # has functions that only lpi_spx is using
    29072911
    29082912test:
  • ThirdParty/SCIP/trunk/coinscip-uninstalled.pc.in

    r2701 r2713  
    66URL: https://projects.coin-or.org/BuildTools
    77Version: @PACKAGE_VERSION@
    8 Libs: ${libdir}/libcoinsciplpis.la ${libdir}/libcoinscip.la @SCIPLIB_PCLIBS@
     8Libs: ${libdir}/libcoinscip.la ${libdir}/libcoinsciplpis.la @SCIPLIB_PCLIBS@
    99Cflags: -I@abs_source_dir@ -I@abs_source_dir@/scip/src
    1010Requires: @SCIPLIB_PCREQUIRES@
  • ThirdParty/SCIP/trunk/coinscip.pc.in

    r2701 r2713  
    88URL: https://projects.coin-or.org/BuildTools
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lcoinsciplpis -lcoinscip @SCIPLIB_PCLIBS@
     10Libs: -L${libdir} -lcoinscip -lcoinsciplpis @SCIPLIB_PCLIBS@
    1111Cflags: -I${includedir}
    1212Requires: @SCIPLIB_PCREQUIRES@
Note: See TracChangeset for help on using the changeset viewer.