dependencies: Bump SCIP to v804
This commit is contained in:
@@ -8,4 +8,4 @@ CoinUtils=2.11.6
|
||||
Eigen=3.4.0
|
||||
Re2=2023-08-01
|
||||
HiGHS=v1.6.0
|
||||
Scip=v803
|
||||
Scip=v804
|
||||
|
||||
@@ -131,7 +131,7 @@ new_git_repository(
|
||||
build_file = "//bazel:scip.BUILD",
|
||||
patches = ["//bazel:scip.patch"],
|
||||
patch_args = ["-p1"],
|
||||
tag = "v803",
|
||||
tag = "v804",
|
||||
remote = "https://github.com/scipopt/scip.git",
|
||||
)
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ cc_library(
|
||||
"-DSCIP_WITH_ZLIB",
|
||||
"-DWITH_SCIPDEF",
|
||||
"-DSCIP_ROUNDING_FE",
|
||||
"-DTPI_TNYC", # src/tpi/type_tpi_tnycthrd.h
|
||||
"-DTPI_TNY", # src/tpi/type_tpi_tnycthrd.h
|
||||
# Compile in thead-safe mode (required since we use TPI_TNYC). Note,
|
||||
# one does not technically need to add this, as SCIP code always
|
||||
# uses syntax like "#ifndef NPARASCIP". But let's be explicit here.
|
||||
|
||||
@@ -245,8 +245,8 @@ if(BUILD_SCIP)
|
||||
FetchContent_Declare(
|
||||
scip
|
||||
GIT_REPOSITORY "https://github.com/scipopt/scip.git"
|
||||
GIT_TAG "v803"
|
||||
#PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v803.patch"
|
||||
GIT_TAG "v804"
|
||||
#PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v804.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(scip)
|
||||
set(LPI_GLOP_SRC ${scip_SOURCE_DIR}/src/lpi/lpi_glop.cpp PARENT_SCOPE)
|
||||
|
||||
Reference in New Issue
Block a user