backport deps bump from main
This commit is contained in:
14
WORKSPACE
14
WORKSPACE
@@ -29,7 +29,7 @@ bazel_skylib_workspace()
|
||||
## Bazel rules.
|
||||
git_repository(
|
||||
name = "platforms",
|
||||
tag = "0.0.8",
|
||||
tag = "0.0.9",
|
||||
remote = "https://github.com/bazelbuild/platforms.git",
|
||||
)
|
||||
|
||||
@@ -47,7 +47,7 @@ git_repository(
|
||||
|
||||
git_repository(
|
||||
name = "rules_java",
|
||||
tag = "7.3.2",
|
||||
tag = "7.5.0",
|
||||
remote = "https://github.com/bazelbuild/rules_java.git",
|
||||
)
|
||||
|
||||
@@ -81,8 +81,8 @@ new_git_repository(
|
||||
## Abseil-cpp
|
||||
git_repository(
|
||||
name = "com_google_absl",
|
||||
tag = "20240116.1",
|
||||
patches = ["//patches:abseil-cpp-20240116.1.patch"],
|
||||
tag = "20240116.2",
|
||||
patches = ["//patches:abseil-cpp-20240116.2.patch"],
|
||||
patch_args = ["-p1"],
|
||||
remote = "https://github.com/abseil/abseil-cpp.git",
|
||||
)
|
||||
@@ -90,7 +90,7 @@ git_repository(
|
||||
## Re2
|
||||
git_repository(
|
||||
name = "com_google_re2",
|
||||
tag = "2024-03-01",
|
||||
tag = "2024-04-01",
|
||||
remote = "https://github.com/google/re2.git",
|
||||
repo_mapping = {"@abseil-cpp": "@com_google_absl"},
|
||||
)
|
||||
@@ -245,7 +245,7 @@ git_repository(
|
||||
new_git_repository(
|
||||
name = "pybind11",
|
||||
build_file = "@pybind11_bazel//:pybind11.BUILD",
|
||||
tag = "v2.11.1",
|
||||
tag = "v2.12.0",
|
||||
remote = "https://github.com/pybind/pybind11.git",
|
||||
)
|
||||
|
||||
@@ -308,7 +308,7 @@ contrib_rules_jvm_setup()
|
||||
## Testing
|
||||
git_repository(
|
||||
name = "com_google_googletest",
|
||||
tag = "v1.13.0",
|
||||
tag = "v1.14.0",
|
||||
remote = "https://github.com/google/googletest.git",
|
||||
)
|
||||
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
# Copyright 2010-2024 Google LLC
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
#[=======================================================================[.rst:
|
||||
Findglog
|
||||
--------
|
||||
|
||||
This module determines the glog library of the system.
|
||||
|
||||
IMPORTED Targets
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
This module defines :prop_tgt:`IMPORTED` target ``glog::glog``, if
|
||||
glog has been found.
|
||||
|
||||
Result Variables
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
This module defines the following variables:
|
||||
|
||||
::
|
||||
|
||||
glog_FOUND - True if glog found.
|
||||
|
||||
#]=======================================================================]
|
||||
find_package(PkgConfig REQUIRED)
|
||||
|
||||
pkg_check_modules(GLOG REQUIRED libglog IMPORTED_TARGET GLOBAL)
|
||||
add_library(glog::glog ALIAS PkgConfig::GLOG)
|
||||
@@ -83,8 +83,8 @@ if(BUILD_absl)
|
||||
FetchContent_Declare(
|
||||
abseil-cpp
|
||||
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
|
||||
GIT_TAG "20240116.1"
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240116.1.patch"
|
||||
GIT_TAG "20240116.2"
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240116.2.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(abseil-cpp)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
@@ -122,8 +122,8 @@ if(BUILD_re2)
|
||||
FetchContent_Declare(
|
||||
re2
|
||||
GIT_REPOSITORY "https://github.com/google/re2.git"
|
||||
GIT_TAG "2024-03-01"
|
||||
#PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/re2-2024-03-01.patch"
|
||||
GIT_TAG "2024-04-01"
|
||||
#PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/re2-2024-04-01.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(re2)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
@@ -162,12 +162,13 @@ endif()
|
||||
if(BUILD_PYTHON AND BUILD_pybind11)
|
||||
message(CHECK_START "Fetching pybind11")
|
||||
list(APPEND CMAKE_MESSAGE_INDENT " ")
|
||||
set(PYBIND11_FINDPYTHON ON)
|
||||
set(PYBIND11_INSTALL ON)
|
||||
set(PYBIND11_TEST OFF)
|
||||
FetchContent_Declare(
|
||||
pybind11
|
||||
GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
|
||||
GIT_TAG "v2.11.1"
|
||||
GIT_TAG "v2.12.0"
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11.patch"
|
||||
)
|
||||
FetchContent_MakeAvailable(pybind11)
|
||||
|
||||
@@ -105,8 +105,8 @@ set(ABSL_PROPAGATE_CXX_STD ON)
|
||||
FetchContent_Declare(
|
||||
absl
|
||||
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
|
||||
GIT_TAG "20240116.1"
|
||||
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20240116.1.patch")
|
||||
GIT_TAG "20240116.2"
|
||||
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20240116.2.patch")
|
||||
FetchContent_MakeAvailable(absl)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
message(CHECK_PASS "fetched")
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
exports_files([
|
||||
"abseil-cpp-20240116.1.patch",
|
||||
"abseil-cpp-20240116.2.patch",
|
||||
"highs.patch",
|
||||
"protobuf-v26.1.patch",
|
||||
"pybind11_abseil.patch",
|
||||
|
||||
Reference in New Issue
Block a user