Skip to content

Fix CMake package config file #3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mizux merged 2 commits into from
Jan 14, 2022
Merged

Fix CMake package config file #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d38439c
Fix CMake package config file
gmgunter Jan 11, 2022
76c34d9
Only install FindXXX.cmake modules if COIN-OR support was enabled
gmgunter Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/FindCbc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions cmake/FindClp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 8 additions & 0 deletions cmake/cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 4 additions & 2 deletions cmake/ortoolsConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down