Skip to content

Commit

Permalink
no longer need to define COIN_HAS_CLP it seems
Browse files Browse the repository at this point in the history
- fixes warning
../../src/CbcOrClpParam.cpp:8: warning: "COIN_HAS_CLP" redefined
    8 | #define COIN_HAS_CLP
      |
<command-line>: note: this is the location of the previous definition
  • Loading branch information
svigerske committed Jan 18, 2022
1 parent c905d83 commit 0906c72
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 0 additions & 4 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 1 addition & 4 deletions src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0906c72

Please sign in to comment.