summaryrefslogtreecommitdiffstats
path: root/external/coinmp/ExternalProject_coinmp.mk
diff options
context:
space:
mode:
Diffstat (limited to 'external/coinmp/ExternalProject_coinmp.mk')
-rw-r--r--external/coinmp/ExternalProject_coinmp.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index 4faa04138b8b..559d9eb1b11b 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
+$(call gb_ExternalProject_run,build,\
$(gb_RUN_CONFIGURE) ./configure COIN_SKIP_PROJECTS="Data/Sample" \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(gb_CONFIGURE_PLATFORMS) \
$(if $(DISABLE_DYNLOADING),--disable-shared) \
--disable-bzlib \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
@@ -43,14 +43,15 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
- $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbc.3.8.8.dylib \
- $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \
- $(EXTERNAL_WORKDIR)/Cgl/src/.libs/libCgl.1.8.5.dylib \
- $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClp.1.12.6.dylib \
- $(EXTERNAL_WORKDIR)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \
- $(EXTERNAL_WORKDIR)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \
- $(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \
- $(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \
+ $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbc.3.9.10.dylib \
+ $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbcSolver.3.9.10.dylib \
+ $(EXTERNAL_WORKDIR)/Cgl/src/.libs/libCgl.1.9.11.dylib \
+ $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClp.1.13.12.dylib \
+ $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClpSolver.1.13.12.dylib \
+ $(EXTERNAL_WORKDIR)/Clp/src/OsiClp/.libs/libOsiClp.1.13.12.dylib \
+ $(EXTERNAL_WORKDIR)/CoinMP/src/.libs/libCoinMP.1.8.4.dylib \
+ $(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.10.15.dylib \
+ $(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.12.10.dylib) \
)
$(call gb_Trace_EndRange,coinmp,EXTERNAL)