From 0906c720588065b0f94467b8aa6899c79a2c1114 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Tue, 18 Jan 2022 05:14:01 +0100 Subject: [PATCH] no longer need to define COIN_HAS_CLP it seems - fixes warning ../../src/CbcOrClpParam.cpp:8: warning: "COIN_HAS_CLP" redefined 8 | #define COIN_HAS_CLP | : note: this is the location of the previous definition --- src/Makefile.am | 4 ---- src/Makefile.in | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4aea0e6b..2d937f10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -168,10 +168,6 @@ clp_LDADD = libClp.la $(CLPLIB_LFLAGS) AM_CPPFLAGS = $(CLPLIB_CFLAGS) -# CbcOrClpParam seem to require COIN_HAS_CLP so that it knows that it -# is built within Clp -AM_CPPFLAGS += -DCOIN_HAS_CLP - # Use additional libtool flags AM_LDFLAGS = $(LT_LDFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index c73535ce..82923642 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -691,10 +691,7 @@ clp_LDADD = libClp.la $(CLPLIB_LFLAGS) ######################################################################## # Additional flags # ######################################################################## - -# CbcOrClpParam seem to require COIN_HAS_CLP so that it knows that it -# is built within Clp -AM_CPPFLAGS = $(CLPLIB_CFLAGS) -DCOIN_HAS_CLP +AM_CPPFLAGS = $(CLPLIB_CFLAGS) # Use additional libtool flags AM_LDFLAGS = $(LT_LDFLAGS)