ARROW-11836: [C++] Avoid requiring arrow_bundled_dependencies when it doesn't exist for arrow_static. #9622
Conversation
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
…arrow_static. Signed-off-by: Tao He <sighingnow@gmail.com>
kou
reviewed
Mar 3, 2021
cpp/src/arrow/ArrowConfig.cmake.in
Outdated
| IMPORTED_LOCATION | ||
| "${arrow_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}arrow_bundled_dependencies${CMAKE_STATIC_LIBRARY_SUFFIX}" | ||
| ) | ||
| if(@ARROW_BUNDLED_STATIC_LIBS@) |
There was a problem hiding this comment.
This doesn't work when we have two or more bundled static libraries. e.g.:
if(jemalloc::jemalloc;mimalloc::mimalloc)
# ...
endif()doesn't work:
CMake Error at /tmp/local/lib/cmake/arrow/ArrowConfig.cmake:99 (if):
if given arguments:
"jemalloc::jemalloc" "mimalloc::mimalloc"
Unknown arguments specified
Call Stack (most recent call first):
/tmp/local/lib/cmake/arrow/FindArrow.cmake:213 (find_package)
/tmp/local/lib/cmake/arrow/FindArrow.cmake:320 (arrow_find_package_cmake_package_configuration)
/tmp/local/lib/cmake/arrow/FindArrow.cmake:357 (arrow_find_package)
CMakeLists.txt:24 (find_package)
How about using a variable?
diff --git a/cpp/src/arrow/ArrowConfig.cmake.in b/cpp/src/arrow/ArrowConfig.cmake.in
index a5a3619eb..6209baeec 100644
--- a/cpp/src/arrow/ArrowConfig.cmake.in
+++ b/cpp/src/arrow/ArrowConfig.cmake.in
@@ -37,6 +37,7 @@ set(ARROW_FULL_SO_VERSION "@ARROW_FULL_SO_VERSION@")
set(ARROW_LIBRARY_PATH_SUFFIXES "@ARROW_LIBRARY_PATH_SUFFIXES@")
set(ARROW_INCLUDE_PATH_SUFFIXES "@ARROW_INCLUDE_PATH_SUFFIXES@")
set(ARROW_SYSTEM_DEPENDENCIES "@ARROW_SYSTEM_DEPENDENCIES@")
+set(ARROW_BUNDLED_STATIC_LIBS "@ARROW_BUNDLED_STATIC_LIBS@")
include("${CMAKE_CURRENT_LIST_DIR}/ArrowOptions.cmake")
@@ -71,7 +72,7 @@ if(NOT (TARGET arrow_shared OR TARGET arrow_static))
get_property(arrow_static_loc TARGET arrow_static PROPERTY LOCATION)
get_filename_component(arrow_lib_dir ${arrow_static_loc} DIRECTORY)
- if(@ARROW_BUNDLED_STATIC_LIBS@)
+ if(ARROW_BUNDLED_STATIC_LIBS)
add_library(arrow_bundled_dependencies STATIC IMPORTED)
set_target_properties(
arrow_bundled_dependenciesThere was a problem hiding this comment.
Thanks! Thanks deinitely works!
nealrichardson
changed the title
GeorgeAp
pushed a commit
to sirensolutions/arrow
that referenced
this pull request
Jun 7, 2021
… doesn't exist for arrow_static. Closes apache#9622 from sighingnow/ht/fixes-find-arrow_bundled_dependencies Authored-by: Tao He <sighingnow@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
michalursa
pushed a commit
to michalursa/arrow
that referenced
this pull request
Jun 13, 2021
… doesn't exist for arrow_static. Closes apache#9622 from sighingnow/ht/fixes-find-arrow_bundled_dependencies Authored-by: Tao He <sighingnow@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.