Changeset 2714

Timestamp:

Apr 6, 2013 4:41:15 PM (8 years ago)

Author:

stefan

Message:

sync with trunk rev 2713

Location:

ThirdParty/SCIP/stable/1.2

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (3 diffs)
• coinscip-uninstalled.pc.in (modified) (1 diff)
• coinscip.pc.in (modified) (1 diff)

ThirdParty/SCIP/stable/1.2/Makefile.am

@@ -202 +202 @@
 libcoinsciplpis_la_SOURCES = lpiswitch.c lpiswitch_init.cpp lpiswitch_none.c
 if COIN_HAS_SOPLEX
+  # for static builds, we need bitencode also in the lpis library,
+  # because it is listed after the scip lib on the linker line but
+  # has functions that only lpi_spx is using
+  libcoinsciplpis_la_SOURCES += scip/src/scip/bitencode.c
   libcoinsciplpis_la_SOURCES += lpiswitch_spx.cpp
 endif  

ThirdParty/SCIP/stable/1.2/Makefile.in

@@ -53 +53 @@
 build_triplet = @build@
 host_triplet = @host@
-@COIN_HAS_SOPLEX_TRUE@am__append_1 = lpiswitch_spx.cpp
+@COIN_HAS_SOPLEX_TRUE@am__append_1 = scip/src/scip/bitencode.c \
+@COIN_HAS_SOPLEX_TRUE@  lpiswitch_spx.cpp
 @COIN_HAS_CLP_TRUE@am__append_2 = lpiswitch_clp.cpp
 @COIN_HAS_CPX_TRUE@am__append_3 = lpiswitch_cpx.c
@@ -268 +269 @@
 libcoinsciplpis_la_LIBADD =
 am__libcoinsciplpis_la_SOURCES_DIST = lpiswitch.c lpiswitch_init.cpp \
-        lpiswitch_none.c lpiswitch_spx.cpp lpiswitch_clp.cpp \
-        lpiswitch_cpx.c lpiswitch_msk.c lpiswitch_xprs.c \
-        lpiswitch_grb.c lpiswitch_qso.c
-@COIN_HAS_SOPLEX_TRUE@am__objects_3 = lpiswitch_spx.lo
+        lpiswitch_none.c scip/src/scip/bitencode.c lpiswitch_spx.cpp \
+        lpiswitch_clp.cpp lpiswitch_cpx.c lpiswitch_msk.c \
+        lpiswitch_xprs.c lpiswitch_grb.c lpiswitch_qso.c
+@COIN_HAS_SOPLEX_TRUE@am__objects_3 = bitencode.lo lpiswitch_spx.lo
 @COIN_HAS_CLP_TRUE@am__objects_4 = lpiswitch_clp.lo
 @COIN_HAS_CPX_TRUE@am__objects_5 = lpiswitch_cpx.lo
@@ -2905 +2906 @@
         uninstall-thirdpartyscipincludeHEADERS
 
+@COIN_HAS_SOPLEX_TRUE@  # for static builds, we need bitencode also in the lpis library,
+@COIN_HAS_SOPLEX_TRUE@  # because it is listed after the scip lib on the linker line but
+@COIN_HAS_SOPLEX_TRUE@  # has functions that only lpi_spx is using
 
 test:

ThirdParty/SCIP/stable/1.2/coinscip-uninstalled.pc.in

@@ -6 +6 @@
 URL: https://projects.coin-or.org/BuildTools
 Version: @PACKAGE_VERSION@
-Libs: ${libdir}/libcoinsciplpis.la ${libdir}/libcoinscip.la @SCIPLIB_PCLIBS@
+Libs: ${libdir}/libcoinscip.la ${libdir}/libcoinsciplpis.la @SCIPLIB_PCLIBS@
 Cflags: -I@abs_source_dir@ -I@abs_source_dir@/scip/src
 Requires: @SCIPLIB_PCREQUIRES@

ThirdParty/SCIP/stable/1.2/coinscip.pc.in

@@ -8 +8 @@
 URL: https://projects.coin-or.org/BuildTools
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lcoinsciplpis -lcoinscip @SCIPLIB_PCLIBS@
+Libs: -L${libdir} -lcoinscip -lcoinsciplpis @SCIPLIB_PCLIBS@
 Cflags: -I${includedir}
 Requires: @SCIPLIB_PCREQUIRES@