Skip to content
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

Jump to bottom

ci: upgrade cmake to Fedora:40 #14195

Merged
merged 4 commits into from
May 13, 2024
Merged

ci: upgrade cmake to Fedora:40 #14195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
885baa4
ci: upgrade cmake to Fedora:40
alevenberg May 9, 2024
bfdfd96
add abi compat flag
alevenberg May 9, 2024
b42594f
add abi flag to cmake-install.sh
alevenberg May 10, 2024
905d901
apply coryan@ patch
alevenberg May 13, 2024
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
1 change: 1 addition & 0 deletions ci/cloudbuild/builds/clang-tidy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ fi
# require a newer C++ standard.
io::run cmake "${cmake_args[@]}" \
-DCMAKE_CXX_CLANG_TIDY=/usr/local/bin/clang-tidy-wrapper \
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
-DCMAKE_CXX_STANDARD=14 \
-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=ON \
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
Expand Down
1 change: 1 addition & 0 deletions ci/cloudbuild/builds/cmake-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ readonly ENABLED_FEATURES
cmake "${cmake_args[@]}" \
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-DCMAKE_INSTALL_MESSAGE=NEVER \
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
-DBUILD_TESTING=OFF \
-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF \
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}"
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM fedora:39
FROM fedora:40
ARG NCPU=4
ARG ARCH=amd64

Expand Down
4 changes: 4 additions & 0 deletions generator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ create_bazel_config(google_cloud_cpp_generator YEAR "2020")

# Build protoc plugin executable
add_executable(protoc-gen-cpp_codegen plugin_main.cc)
google_cloud_cpp_add_common_options(protoc-gen-cpp_codegen)
target_link_libraries(
protoc-gen-cpp_codegen LINK_PUBLIC google_cloud_cpp_generator
protobuf::libprotoc ${Protobuf_LIBRARIES})
Expand All @@ -188,11 +189,14 @@ else ()
endif ()
target_link_libraries(google_cloud_cpp_generator_config
PUBLIC protobuf::libprotobuf)
google_cloud_cpp_add_common_options(google_cloud_cpp_generator_config
NO_WARNINGS)
set_target_properties(google_cloud_cpp_generator_config
PROPERTIES CXX_CLANG_TIDY "")

# Build standalone executable
add_executable(google-cloud-cpp-codegen standalone_main.cc)
google_cloud_cpp_add_common_options(google-cloud-cpp-codegen)
target_link_libraries(
google-cloud-cpp-codegen
PUBLIC google_cloud_cpp_generator_config google_cloud_cpp_generator
Expand Down