From 43158791f89e9e65d31b008751c0dd407d164cde Mon Sep 17 00:00:00 2001 From: Amit Prakash Ambasta Date: Wed, 14 Jun 2017 17:30:51 +0530 Subject: [PATCH] Change includedirs for cbc projects built internally --- CMakeLists.txt | 2 +- Dependencies.txt | 2 +- cmake/external/cbc.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 230b7a0bfa..59ff0363bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ IF(BUILD_CXX) ENDIF() INCLUDE_DIRECTORIES(${Protobuf_INCLUDE_DIRS}) - FIND_PACKAGE(gflags ${gflags_VERSION} QUIET) + FIND_PACKAGE(gflags ${gflags_VERSION}) IF(NOT gflags_FOUND) MESSAGE(STATUS "Did not find system gflags. Building as an external project") INCLUDE(cmake/external/gflags.cmake) diff --git a/Dependencies.txt b/Dependencies.txt index 10778d1479..555440712c 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,7 +1,7 @@ Protobuf = 3.3.0 gflags = 2.2.0 glog = 0.3.5 -Cbc = 2.8.9 +Cbc = 2.9.8 CoinUtils = 2.10.13 Osi = 0.107.8 Clp = 1.16.10 diff --git a/cmake/external/cbc.cmake b/cmake/external/cbc.cmake index d1a7f686dd..b87f99bf28 100644 --- a/cmake/external/cbc.cmake +++ b/cmake/external/cbc.cmake @@ -2,7 +2,7 @@ SET(ADD_CXXFLAGS "-DCBC_THREAD_SAFE -DCBC_NO_INTERRUPT") FOREACH(COIN_PROJECT CoinUtils Osi Clp Cgl Cbc) SET(${COIN_PROJECT}_URL https://github.com/coin-or/${COIN_PROJECT}.git) - SET(${COIN_PROJECT}_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/install/include) + SET(${COIN_PROJECT}_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/install/include/coin) ExternalProject_Add(${COIN_PROJECT}_project PREFIX ${COIN_PROJECT}