diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake index b74f711f2c..e8b3c78b41 100644 --- a/cmake/cpp.cmake +++ b/cmake/cpp.cmake @@ -25,6 +25,10 @@ if(NOT BUILD_absl) endif() set(ABSL_DEPS absl::base + absl::flags + absl::flags_commandlineflag + absl::flags_parse + absl::flags_usage absl::cord absl::random_random absl::raw_hash_set @@ -40,21 +44,6 @@ set(ABSL_DEPS absl::any ) -set(GFLAGS_USE_TARGET_NAMESPACE TRUE) -if(NOT BUILD_gflags) - find_package(gflags REQUIRED) -endif() -if(NOT TARGET gflags::gflags) - message(FATAL_ERROR "Target gflags::gflags not available.") -endif() - -if(NOT BUILD_glog) - find_package(glog REQUIRED) -endif() -if(NOT TARGET glog::glog) - message(FATAL_ERROR "Target glog::glog not available.") -endif() - if(NOT BUILD_Protobuf) find_package(Protobuf REQUIRED) endif() @@ -216,8 +205,6 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS} ZLIB::ZLIB ${ABSL_DEPS} - gflags::gflags - glog::glog protobuf::libprotobuf ${COINOR_DEPS} $<$:libscip> diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index f0c06443cc..f38674bc86 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -73,43 +73,6 @@ if(BUILD_absl) message(CHECK_PASS "fetched") endif() -# ############################################################################## -# GFLAGS -# ############################################################################## -if(BUILD_gflags) - message(CHECK_START "Fetching gflags") - list(APPEND CMAKE_MESSAGE_INDENT " ") - set(INSTALL_HEADERS ON) - set(INSTALL_SHARED_LIBS OFF) - set(BUILD_STATIC_LIBS ON) - set(INSTALL_STATIC_LIBS ON) - FetchContent_Declare( - gflags - GIT_REPOSITORY "https://github.com/gflags/gflags.git" - GIT_TAG "v2.2.2" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../patches/gflags-v2.2.2.patch") - FetchContent_MakeAvailable(gflags) - list(POP_BACK CMAKE_MESSAGE_INDENT) - message(CHECK_PASS "fetched") -endif() - -# ############################################################################## -# GLOG -# ############################################################################## -if(BUILD_glog) - message(CHECK_START "Fetching glog") - list(APPEND CMAKE_MESSAGE_INDENT " ") - FetchContent_Declare( - glog - GIT_REPOSITORY "https://github.com/google/glog.git" - GIT_TAG "v0.4.0" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../patches/glog-v0.4.0.patch") - set(WITH_GFLAGS OFF) - FetchContent_MakeAvailable(glog) - list(POP_BACK CMAKE_MESSAGE_INDENT) - message(CHECK_PASS "fetched") -endif() - # ############################################################################## # SCIP # ############################################################################## diff --git a/cmake/ortoolsConfig.cmake.in b/cmake/ortoolsConfig.cmake.in index 9708abf460..845571c341 100644 --- a/cmake/ortoolsConfig.cmake.in +++ b/cmake/ortoolsConfig.cmake.in @@ -17,24 +17,23 @@ endif() if(NOT absl_FOUND) find_dependency(absl REQUIRED ${CONFIG_FLAG}) endif() -if(NOT gflags_FOUND AND NOT TARGET gflags::gflags) - set(GFLAGS_USE_TARGET_NAMESPACE TRUE) - find_dependency(gflags REQUIRED ${CONFIG_FLAG}) -endif() -if(NOT glog_FOUND AND NOT TARGET glog::glog) - find_dependency(glog REQUIRED ${CONFIG_FLAG}) -endif() if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND AND NOT TARGET protobuf::libprotobuf) find_dependency(Protobuf REQUIRED ${CONFIG_FLAG}) endif() -if(NOT scip_FOUND AND NOT TARGET libscip) - find_dependency(scip REQUIRED ${CONFIG_FLAG}) + +if(@USE_SCIP@) + if(NOT scip_FOUND AND NOT TARGET libscip) + find_dependency(scip REQUIRED ${CONFIG_FLAG}) + endif() endif() -if(NOT Clp_FOUND AND NOT TARGET Coin::ClpSolver) - find_dependency(Clp REQUIRED ${CONFIG_FLAG}) -endif() -if(NOT Cbc_FOUND AND NOT TARGET Coin::CbcSolver) - find_dependency(Cbc REQUIRED ${CONFIG_FLAG}) + +if(@USE_COINOR@) + if(NOT Clp_FOUND AND NOT TARGET Coin::ClpSolver) + find_dependency(Clp REQUIRED ${CONFIG_FLAG}) + endif() + if(NOT Cbc_FOUND AND NOT TARGET Coin::CbcSolver) + find_dependency(Cbc REQUIRED ${CONFIG_FLAG}) + endif() endif() include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/ortools/algorithms/CMakeLists.txt b/ortools/algorithms/CMakeLists.txt index 9b024f315a..a2facd051c 100644 --- a/ortools/algorithms/CMakeLists.txt +++ b/ortools/algorithms/CMakeLists.txt @@ -21,8 +21,6 @@ target_include_directories(${NAME} PRIVATE target_link_libraries(${NAME} PRIVATE absl::memory absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::algorithms ALIAS ${NAME}) diff --git a/ortools/bop/CMakeLists.txt b/ortools/bop/CMakeLists.txt index 60337a8559..67d5e11861 100644 --- a/ortools/bop/CMakeLists.txt +++ b/ortools/bop/CMakeLists.txt @@ -17,8 +17,6 @@ target_link_libraries(${NAME} PRIVATE absl::memory absl::synchronization absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::bop ALIAS ${NAME}) diff --git a/ortools/constraint_solver/CMakeLists.txt b/ortools/constraint_solver/CMakeLists.txt index 3c1c94c526..c140d22a2a 100644 --- a/ortools/constraint_solver/CMakeLists.txt +++ b/ortools/constraint_solver/CMakeLists.txt @@ -20,8 +20,6 @@ target_link_libraries(${NAME} PRIVATE absl::container absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::constraint_solver ALIAS ${NAME}) diff --git a/ortools/data/CMakeLists.txt b/ortools/data/CMakeLists.txt index 7ac4cb4e45..141a971fa1 100644 --- a/ortools/data/CMakeLists.txt +++ b/ortools/data/CMakeLists.txt @@ -15,8 +15,6 @@ target_include_directories(${NAME} PRIVATE ${PROJECT_BINARY_DIR}) target_link_libraries(${NAME} PRIVATE absl::strings - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::data ALIAS ${NAME}) diff --git a/ortools/glop/CMakeLists.txt b/ortools/glop/CMakeLists.txt index 74acdf50cb..45df70920e 100644 --- a/ortools/glop/CMakeLists.txt +++ b/ortools/glop/CMakeLists.txt @@ -18,8 +18,6 @@ target_link_libraries(${NAME} PRIVATE absl::container absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::glop ALIAS ${NAME}) diff --git a/ortools/graph/CMakeLists.txt b/ortools/graph/CMakeLists.txt index 666c0c4634..416bd2e452 100644 --- a/ortools/graph/CMakeLists.txt +++ b/ortools/graph/CMakeLists.txt @@ -19,8 +19,6 @@ target_link_libraries(${NAME} PRIVATE absl::memory absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto $<$:Coin::Cbc>) diff --git a/ortools/gscip/CMakeLists.txt b/ortools/gscip/CMakeLists.txt index 85ede3b0f7..944fed4425 100644 --- a/ortools/gscip/CMakeLists.txt +++ b/ortools/gscip/CMakeLists.txt @@ -23,8 +23,6 @@ target_link_libraries(${NAME} PRIVATE absl::container absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf $<$:libscip> ${PROJECT_NAME}::proto) diff --git a/ortools/linear_solver/CMakeLists.txt b/ortools/linear_solver/CMakeLists.txt index cd4b603c24..ae21cff8ac 100644 --- a/ortools/linear_solver/CMakeLists.txt +++ b/ortools/linear_solver/CMakeLists.txt @@ -23,8 +23,6 @@ target_link_libraries(${NAME} PRIVATE absl::container absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf $<$:Coin::Cbc> $<$:Coin::Clp> diff --git a/ortools/lp_data/CMakeLists.txt b/ortools/lp_data/CMakeLists.txt index 89ca5ad8e8..9be192ea43 100644 --- a/ortools/lp_data/CMakeLists.txt +++ b/ortools/lp_data/CMakeLists.txt @@ -17,8 +17,6 @@ target_link_libraries(${NAME} PRIVATE absl::synchronization absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::lp_data ALIAS ${NAME}) diff --git a/ortools/port/CMakeLists.txt b/ortools/port/CMakeLists.txt index dbf2236669..aae580528d 100644 --- a/ortools/port/CMakeLists.txt +++ b/ortools/port/CMakeLists.txt @@ -15,8 +15,6 @@ target_include_directories(${NAME} PRIVATE ${PROJECT_BINARY_DIR}) target_link_libraries(${NAME} PRIVATE absl::strings - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::port ALIAS ${NAME}) diff --git a/ortools/sat/CMakeLists.txt b/ortools/sat/CMakeLists.txt index d65d0f13bb..57ebd88eaa 100644 --- a/ortools/sat/CMakeLists.txt +++ b/ortools/sat/CMakeLists.txt @@ -20,8 +20,6 @@ target_link_libraries(${NAME} PRIVATE absl::container absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf $<$:Coin::Cbc> ${PROJECT_NAME}::proto) diff --git a/ortools/util/CMakeLists.txt b/ortools/util/CMakeLists.txt index 7d0be302a4..b14d317d95 100644 --- a/ortools/util/CMakeLists.txt +++ b/ortools/util/CMakeLists.txt @@ -18,8 +18,6 @@ target_link_libraries(${NAME} PRIVATE absl::memory absl::strings absl::str_format - gflags::gflags - glog::glog protobuf::libprotobuf ${PROJECT_NAME}::proto) #add_library(${PROJECT_NAME}::util ALIAS ${NAME})