Skip to content

Update dependencies: absl, protobuf, cel_cpp, re2 #138

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

Open
jchv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update dependencies: absl, protobuf, cel_cpp, re2 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
option(PROTOVALIDATE_CC_ENABLE_CONFORMANCE "Build conformance runner" OFF)
else()
# Only set C++ standard when not being embedded
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# Standalone: set appropriate defaults for system-wide installation
Expand Down Expand Up @@ -73,7 +73,7 @@ set(PROTOVALIDATE_CC_TEST_SOURCES
list(FILTER PROTOVALIDATE_CC_TEST_SOURCES INCLUDE REGEX ".*_test\\.cc$")
list(FILTER PROTOVALIDATE_CC_CORE_SOURCES EXCLUDE REGEX ".*_test\\.cc$")
add_library(protovalidate_cc ${PROTOVALIDATE_CC_CORE_SOURCES} ${PROTOVALIDATE_CC_CORE_HEADERS})
target_compile_features(protovalidate_cc PUBLIC cxx_std_17)
target_compile_features(protovalidate_cc PUBLIC cxx_std_20)
target_link_libraries(protovalidate_cc PUBLIC ${PROTOVALIDATE_LIBS})
target_include_directories(protovalidate_cc PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
Expand Down
8 changes: 4 additions & 4 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ module(
version = "0.0.0",
)

bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
bazel_dep(name = "re2", version = "2025-11-05.bcr.1", repo_name = "com_googlesource_code_re2")

bazel_dep(name = "protobuf", version = "29.2", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "32.1", repo_name = "com_google_protobuf")

bazel_dep(name = "rules_proto", version = "7.1.0")

bazel_dep(name = "rules_buf", version = "0.3.0")

bazel_dep(name = "googletest", version = "1.16.0.bcr.1", repo_name = "com_google_googletest")

bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
bazel_dep(name = "abseil-cpp", version = "20260107.0", repo_name = "com_google_absl")

bazel_dep(name = "cel-cpp", version = "0.11.0", repo_name = "com_google_cel_cpp")
bazel_dep(name = "cel-cpp", version = "0.14.0", repo_name = "com_google_cel_cpp")

bazel_dep(name = "protovalidate", version = "1.0.0", repo_name = "com_github_bufbuild_protovalidate")
2 changes: 1 addition & 1 deletion MODULE.bazel.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module(
version = "0.0.0",
)

bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
bazel_dep(name = "re2", version = "2025-11-05.bcr.1", repo_name = "com_googlesource_code_re2")

bazel_dep(name = "protobuf", version = "{{protobuf.meta.version}}", repo_name = "com_google_protobuf")

Expand Down
11 changes: 3 additions & 8 deletions cmake/Deps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,11 @@ else()
message(FATAL_ERROR "protovalidate-cc: Installation can not be enabled when using vendored re2. Install re2 system-wide, or disable installation using -DPROTOVALIDATE_CC_ENABLE_INSTALL=OFF.")
endif()
message(STATUS "protovalidate-cc: Fetching re2")
set(RE2_PATCHES
${CMAKE_CURRENT_SOURCE_DIR}/deps/patches/re2/0001-Add-RE2_INSTALL-option.patch
)
MakePatchCommand(RE2_PATCH_COMMAND "${RE2_PATCHES}")
FetchContent_Declare(
re2
GIT_REPOSITORY "https://github.com/google/re2.git"
GIT_TAG "2024-04-01"
GIT_TAG "2025-11-05"
GIT_SHALLOW TRUE
PATCH_COMMAND ${RE2_PATCH_COMMAND}
)
set(RE2_INSTALL OFF)
FetchContent_MakeAvailable(re2)
Expand Down Expand Up @@ -284,7 +279,7 @@ FetchContent_Declare(cel_cpp
URL_HASH SHA256=${PROTOVALIDATE_CC_CEL_CPP_SHA256}
PATCH_COMMAND ${CEL_CPP_PATCH_COMMAND}

# THis stops MakeAvailable from trying to add_subdirectory, so we can do it
# This stops MakeAvailable from trying to add_subdirectory, so we can do it
# ourselves after adding the embedded CMakeLists.txt.
SOURCE_SUBDIR nonexistant
)
Expand All @@ -299,7 +294,7 @@ file(COPY_FILE
)
message(STATUS "Added ${cel_cpp_SOURCE_DIR}/CMakeLists.txt")
add_subdirectory(${cel_cpp_SOURCE_DIR} ${cel_cpp_BINARY_DIR})
list(APPEND PROTOVALIDATE_CC_EXPORT_TARGETS
list(APPEND PROTOVALIDATE_CC_EXPORT_TARGETS
cel_cpp
cel_cpp_parser
cel_cpp_minimal_descriptor_set
Expand Down
1 change: 1 addition & 0 deletions cmake/cel-cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ target_include_directories(cel_cpp PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>
)
target_compile_features(cel_cpp PUBLIC cxx_std_20)
target_compile_definitions(cel_cpp PRIVATE ANTLR4CPP_USING_ABSEIL)
add_library(cel_cpp::cel_cpp ALIAS cel_cpp)

Expand Down
Loading