Change includedirs for cbc projects built internally
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
2
cmake/external/cbc.cmake
vendored
2
cmake/external/cbc.cmake
vendored
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user