diff --git a/cmake/FindCbc.cmake b/cmake/FindCbc.cmake index 3870a889894..c0d44070621 100644 --- a/cmake/FindCbc.cmake +++ b/cmake/FindCbc.cmake @@ -22,9 +22,9 @@ Cbc_FOUND - True if Cbc found. #]=======================================================================] find_package(PkgConfig REQUIRED) -pkg_check_modules(CBC REQUIRED cbc IMPORTED_TARGET GLOBAL) -add_library(Coin::Cbc ALIAS PkgConfig::CBC) -add_library(Coin::CbcSolver ALIAS PkgConfig::CBC) +pkg_check_modules(Cbc REQUIRED cbc IMPORTED_TARGET GLOBAL) +add_library(Coin::Cbc ALIAS PkgConfig::Cbc) +add_library(Coin::CbcSolver ALIAS PkgConfig::Cbc) pkg_check_modules(OSI_CBC REQUIRED osi-cbc IMPORTED_TARGET GLOBAL) add_library(Coin::OsiCbc ALIAS PkgConfig::OSI_CBC) diff --git a/cmake/FindClp.cmake b/cmake/FindClp.cmake index 99b98e52e85..a89a12d67bd 100644 --- a/cmake/FindClp.cmake +++ b/cmake/FindClp.cmake @@ -22,9 +22,9 @@ Clp_FOUND - True if Clp found. #]=======================================================================] find_package(PkgConfig REQUIRED) -pkg_check_modules(CLP REQUIRED clp IMPORTED_TARGET GLOBAL) -add_library(Coin::Clp ALIAS PkgConfig::CLP) -add_library(Coin::ClpSolver ALIAS PkgConfig::CLP) +pkg_check_modules(Clp REQUIRED clp IMPORTED_TARGET GLOBAL) +add_library(Coin::Clp ALIAS PkgConfig::Clp) +add_library(Coin::ClpSolver ALIAS PkgConfig::Clp) pkg_check_modules(OSI_CLP REQUIRED osi-clp IMPORTED_TARGET GLOBAL) add_library(Coin::OsiClp ALIAS PkgConfig::OSI_CLP) diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake index 8fad35ce016..395b870b8e4 100644 --- a/cmake/cpp.cmake +++ b/cmake/cpp.cmake @@ -279,6 +279,14 @@ install( "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" COMPONENT Devel) +if(USE_COINOR) + install( + FILES + "${PROJECT_SOURCE_DIR}/cmake/FindCbc.cmake" + "${PROJECT_SOURCE_DIR}/cmake/FindClp.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/modules" + COMPONENT Devel) +endif() # add_cxx_sample() # CMake function to generate and build C++ sample. diff --git a/cmake/ortoolsConfig.cmake.in b/cmake/ortoolsConfig.cmake.in index e6475b4f3f5..3c05af3b53b 100644 --- a/cmake/ortoolsConfig.cmake.in +++ b/cmake/ortoolsConfig.cmake.in @@ -29,11 +29,13 @@ if(@BUILD_LP_PARSER@) endif() if(@USE_COINOR@) + # COIN-OR packages don't provide CMake config files + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") if(NOT Clp_FOUND AND NOT TARGET Coin::ClpSolver) - find_dependency(Clp REQUIRED ${CONFIG_FLAG}) + find_dependency(Clp REQUIRED) endif() if(NOT Cbc_FOUND AND NOT TARGET Coin::CbcSolver) - find_dependency(Cbc REQUIRED ${CONFIG_FLAG}) + find_dependency(Cbc REQUIRED) endif() endif()