Skip to content

Commit

Permalink
GH-44606: [C++] Add find module for abseil that handles missing versi…
Browse files Browse the repository at this point in the history
…on (#44613)

### Rationale for this change
Abseil's recommended usage is to build from trunk, this version does not provide a package version in CMake which breaks `resolve_dependency`.

### What changes are included in this PR?

Add `FindabslAlt.cmake` that adds a big version if it is missing to compare against our minimal version requirements.

### Are these changes tested?

CI

### Are there any user-facing changes?

Abseil build from head should now work without workaround.
* GitHub Issue: #44606

Lead-authored-by: Jacob Wujciak-Jens <jacob@wujciak.de>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Jacob Wujciak-Jens <jacob@wujciak.de>
  • Loading branch information
assignUser and kou authored Nov 8, 2024
1 parent 5fe87a3 commit 093655c
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
46 changes: 46 additions & 0 deletions cpp/cmake_modules/FindabslAlt.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

if(abslAlt_FOUND)
return()
endif()

set(find_package_args)

if(abslAlt_FIND_QUIETLY)
list(APPEND find_package_args QUIET)
endif()
if(abslAlt_FIND_REQUIRED)
list(APPEND find_package_args REQUIRED)
endif()

find_package(absl ${find_package_args})

if(NOT DEFINED absl_VERSION)
# Abseil does not define a version when build 'live at head'.
# As this is their recommended path we need to define a large version to pass version checks.
# CMake removes the '_head' suffix for version comparison but it will show up in the logs
# and matches the abseil-cpp.pc version of 'head'
set(absl_VERSION 99999999_head)
endif()

set(abslAlt_VERSION ${absl_VERSION})

find_package_handle_standard_args(
abslAlt
REQUIRED_VARS absl_FOUND
VERSION_VAR abslAlt_VERSION)
2 changes: 1 addition & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4169,7 +4169,7 @@ if(ARROW_WITH_GOOGLE_CLOUD_CPP OR ARROW_WITH_GRPC)
ARROW_PC_PACKAGE_NAME
${ARROW_ABSL_PC_PACKAGE_NAME}
HAVE_ALT
FALSE
TRUE
FORCE_ANY_NEWER_VERSION
TRUE
REQUIRED_VERSION
Expand Down

0 comments on commit 093655c

Please sign in to comment.