FindCbc should append includedirs for all the subprojects cbc depends on as well
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
|
||||
SET(Cbc_ROOT_DIR "" CACHE PATH "Path to Coin-OR Cbc")
|
||||
IF(WIN32)
|
||||
FIND_PATH(Cbc_INCLUDE_DIR CbcConfig.h PATHS ${Cbc_ROOT_DIR}/src/windows PATH_SUFFIXES coin cbc/coin)
|
||||
ELSE()
|
||||
FIND_PATH(Cbc_INCLUDE_DIR CbcConfig.h PATHS ${Cbc_ROOT_DIR} PATH_SUFFIXES coin cbc/coin)
|
||||
ENDIF()
|
||||
FOREACH(COIN_PROJECT CoinUtils Osi Clp Cgl Cbc)
|
||||
SET(${COIN_PROJECT}_ROOT_DIR "" CACHE PATH "Path to Coin-OR ${COIN_PROJECT}")
|
||||
IF(WIN32)
|
||||
FIND_PATH(${COIN_PROJECT}_INCLUDE_DIR ${COIN_PROJECT}Config.h PATHS ${${COIN_PROJECT}_ROOT_DIR}/src/windows PATH_SUFFIXES coin ${COIN_PROJECT}/coin)
|
||||
ELSE()
|
||||
FIND_PATH(${COIN_PROJECT}_INCLUDE_DIR ${COIN_PROJECT}Config.h PATHS ${${COIN_PROJECT}_ROOT_DIR} PATH_SUFFIXES coin ${COIN_PROJECT}/coin)
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
|
||||
IF(Cbc_INCLUDE_DIR)
|
||||
SET(_Cbc_COMMON_HEADER ${Cbc_INCLUDE_DIR}/CbcConfig.h)
|
||||
@@ -40,6 +42,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cbc
|
||||
|
||||
IF(Cbc_FOUND)
|
||||
SET(Cbc_INCLUDE_DIRS ${Cbc_INCLUDE_DIR})
|
||||
FOREACH(COIN_PROJECT CoinUtils Osi Clp Cgl)
|
||||
LIST(APPEND Cbc_INCLUDE_DIRS ${${COIN_PROJECT}_INCLUDE_DIR})
|
||||
ENDFOREACH()
|
||||
|
||||
SET(Cbc_LIBRARIES "${Cbc_LIBRARY};${Cbc_Solver_LIBRARY}")
|
||||
MARK_AS_ADVANCED(Cbc_ROOT_DIR Cbc_LIBRARY_RELEASE Cbc_LIBRARY_DEBUG Cbc_LIBRARY Cbc_INCLUDE_DIR)
|
||||
ENDIF()
|
||||
|
||||
Reference in New Issue
Block a user