-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
AVRO-3088: [C++] Export CMake package config file #3299
Open
wgtmac
wants to merge
7
commits into
apache:main
Choose a base branch
from
wgtmac:cmake_config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+130
−47
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
30c1597
Export CMake package configuration file
wgtmac 69b9bd8
AVRO-3088: [C++] Export CMake package config file
wgtmac 7c63dbc
simplify generator expression
wgtmac 39494f7
fix AvroConfig.cmake.in
wgtmac 0aa7adf
do not add fmt to install interface
wgtmac ab3afcd
reword error message
wgtmac 426cb6f
remove if statement for required lib
wgtmac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
# | ||
# 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 | ||
# | ||
# https://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. | ||
# | ||
# This config sets the following variables in your project:: | ||
# | ||
# Avro_FOUND - true if Avro found on the system | ||
# Avro_VERSION - version of the found Avro | ||
# | ||
# This config sets the following targets in your project:: | ||
# | ||
# Avro::avrocpp_shared | ||
# Avro::avrocpp_static | ||
|
||
@PACKAGE_INIT@ | ||
|
||
include(CMakeFindDependencyMacro) | ||
|
||
if(DEFINED CMAKE_MODULE_PATH) | ||
set(AVRO_CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) | ||
else() | ||
unset(AVRO_CMAKE_MODULE_PATH_OLD) | ||
endif() | ||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") | ||
|
||
find_dependency(ZLIB REQUIRED) | ||
find_dependency(fmt REQUIRED) | ||
if(@Snappy_FOUND@) | ||
find_dependency(Snappy REQUIRED) | ||
endif() | ||
if(@Boost_FOUND@) | ||
find_dependency(Boost 1.70 REQUIRED COMPONENTS system) | ||
endif() | ||
|
||
if(DEFINED AVRO_CMAKE_MODULE_PATH_OLD) | ||
set(CMAKE_MODULE_PATH ${AVRO_CMAKE_MODULE_PATH_OLD}) | ||
unset(AVRO_CMAKE_MODULE_PATH_OLD) | ||
else() | ||
unset(CMAKE_MODULE_PATH) | ||
endif() | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/AvroTargets.cmake") | ||
|
||
add_library(Avro::avrocpp_static ALIAS Avro::avrocpp_s) | ||
add_library(Avro::avrocpp_shared ALIAS Avro::avrocpp) | ||
|
||
check_required_components(Avro) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see an inconsistency here. The headers are installed in
include/avro
while cmake files are inlib/cmake/Avro
. Maybe it should belib/cmake/avro
instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a case-sensitive package name and it affects the behavior of calling
find_package
by downstream.lib/cmake/avro
->find_package(avro)
lib/cmake/Avro
->find_package(Avro)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm actually not sure which one is more preferable here. I'll probably want to hear from the committers to this repo regarding the naming.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my (poor) experience the convention is to use the one with the capital letter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. It is adopted by many libraries like Boost, Snappy and Arrow.