You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/06/20 14:50:53 UTC
[arrow] branch master updated: ARROW-5659: [C++] Add support for
finding OpenSSL installed by Homebrew
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 00ba735 ARROW-5659: [C++] Add support for finding OpenSSL installed by Homebrew
00ba735 is described below
commit 00ba735fd906602e1493b25196c33151783313db
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Thu Jun 20 09:50:42 2019 -0500
ARROW-5659: [C++] Add support for finding OpenSSL installed by Homebrew
Homebrew OpenSSL is keg-only formula. It means that it's not enabled
automatically. We need to enable it manually.
This is needed to build Flight smoothly on macOS.
This also cleans up Homebrew related codes.
Author: Sutou Kouhei <ko...@clear-code.com>
Closes #4621 from kou/cpp-openssl-macos and squashes the following commits:
9807491dc <Sutou Kouhei> Add support for finding OpenSSL installed by Homebrew
---
cpp/CMakeLists.txt | 15 ++++
cpp/cmake_modules/FindClangTools.cmake | 121 ++++++++++------------------
cpp/cmake_modules/FindLLVM.cmake | 19 +----
cpp/cmake_modules/FindThrift.cmake | 11 ---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 9 ++-
5 files changed, 67 insertions(+), 108 deletions(-)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 79ccbe3..c09bdeb 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -87,6 +87,21 @@ string(
string(
REGEX
REPLACE "^[0-9]+\\.([0-9]+)" "\\1" ARROW_LLVM_MINOR_VERSION "${ARROW_LLVM_VERSION}")
+
+if(APPLE)
+ find_program(BREW_BIN brew)
+ if(BREW_BIN)
+ execute_process(COMMAND ${BREW_BIN} --prefix "llvm@${ARROW_LLVM_MAJOR_VERSION}"
+ OUTPUT_VARIABLE LLVM_BREW_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT LLVM_BREW_PREFIX)
+ execute_process(COMMAND ${BREW_BIN} --prefix llvm
+ OUTPUT_VARIABLE LLVM_BREW_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+ endif()
+endif()
+
find_package(ClangTools)
if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1" OR CLANG_TIDY_FOUND)
# Generate a Clang compile_commands.json "compilation database" file for use
diff --git a/cpp/cmake_modules/FindClangTools.cmake b/cpp/cmake_modules/FindClangTools.cmake
index d64cd89..a6ecbf7 100644
--- a/cpp/cmake_modules/FindClangTools.cmake
+++ b/cpp/cmake_modules/FindClangTools.cmake
@@ -34,102 +34,63 @@
# CLANG_FORMAT_BIN, The path to the clang format binary
# CLANG_FORMAT_FOUND, Whether clang format was found
-if(DEFINED ENV{HOMEBREW_PREFIX})
- set(HOMEBREW_PREFIX "$ENV{HOMEBREW_PREFIX}")
-else()
- find_program(BREW_BIN brew)
- if((NOT ("${BREW_BIN}" STREQUAL "BREW_BIN-NOTFOUND")) AND APPLE)
- execute_process(COMMAND ${BREW_BIN} --prefix
- OUTPUT_VARIABLE HOMEBREW_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- else()
- set(HOMEBREW_PREFIX "/usr/local")
- endif()
-endif()
-
set(CLANG_TOOLS_SEARCH_PATHS
${ClangTools_PATH}
$ENV{CLANG_TOOLS_PATH}
/usr/local/bin
/usr/bin
"C:/Program Files/LLVM/bin" # Windows, non-conda
- "$ENV{CONDA_PREFIX}/Library/bin" # Windows, conda
- "${HOMEBREW_PREFIX}/bin")
-
-find_program(CLANG_TIDY_BIN
- NAMES clang-tidy-${ARROW_LLVM_VERSION} clang-tidy-${ARROW_LLVM_MAJOR_VERSION}
- PATHS ${CLANG_TOOLS_SEARCH_PATHS}
- NO_DEFAULT_PATH)
-
-if("${CLANG_TIDY_BIN}" STREQUAL "CLANG_TIDY_BIN-NOTFOUND")
- set(CLANG_TIDY_FOUND 0)
- message(STATUS "clang-tidy not found")
-else()
- set(CLANG_TIDY_FOUND 1)
- message(STATUS "clang-tidy found at ${CLANG_TIDY_BIN}")
+ "$ENV{CONDA_PREFIX}/Library/bin") # Windows, conda
+if(LLVM_BREW_PREFIX)
+ list(APPEND CLANG_TOOLS_SEARCH_PATHS "${LLVM_BREW_PREFIX}/bin")
endif()
-if(ARROW_LLVM_VERSION)
- find_program(CLANG_FORMAT_BIN
- NAMES clang-format-${ARROW_LLVM_VERSION}
- clang-format-${ARROW_LLVM_MAJOR_VERSION}
+function(FIND_CLANG_TOOL NAME OUTPUT VERSION_CHECK_PATTERN)
+ unset(CLANG_TOOL_BIN CACHE)
+ find_program(CLANG_TOOL_BIN
+ NAMES ${NAME}-${ARROW_LLVM_VERSION} ${NAME}-${ARROW_LLVM_MAJOR_VERSION}
PATHS ${CLANG_TOOLS_SEARCH_PATHS}
NO_DEFAULT_PATH)
-
- # If not found yet, search alternative locations
- if("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND")
- if(APPLE)
- # Homebrew ships older LLVM versions in /usr/local/opt/llvm@version/
- if("${ARROW_LLVM_MINOR_VERSION}" STREQUAL "0")
- find_program(CLANG_FORMAT_BIN
- NAMES clang-format
- PATHS "${HOMEBREW_PREFIX}/opt/llvm@${ARROW_LLVM_MAJOR_VERSION}/bin"
- NO_DEFAULT_PATH)
- else()
- find_program(CLANG_FORMAT_BIN
- NAMES clang-format
- PATHS "${HOMEBREW_PREFIX}/opt/llvm@${ARROW_LLVM_VERSION}/bin"
- NO_DEFAULT_PATH)
- endif()
-
- if("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND")
- # binary was still not found, look into Cellar
- file(GLOB CLANG_FORMAT_PATH
- "${HOMEBREW_PREFIX}/Cellar/llvm/${ARROW_LLVM_VERSION}.*")
- find_program(CLANG_FORMAT_BIN
- NAMES clang-format
- PATHS "${CLANG_FORMAT_PATH}/bin"
- NO_DEFAULT_PATH)
- endif()
- else()
- # try searching for "clang-format" and check the version
- find_program(CLANG_FORMAT_BIN
- NAMES clang-format
- PATHS ${CLANG_TOOLS_SEARCH_PATHS}
- NO_DEFAULT_PATH)
- if(NOT ("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND"))
- execute_process(COMMAND ${CLANG_FORMAT_BIN} "-version"
- OUTPUT_VARIABLE CLANG_FORMAT_FOUND_VERSION_MESSAGE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(
- NOT
- (
- "${CLANG_FORMAT_FOUND_VERSION_MESSAGE}"
- MATCHES
- "^clang-format version ${ARROW_LLVM_MAJOR_VERSION}\\.${ARROW_LLVM_MINOR_VERSION}.*"
- ))
- set(CLANG_FORMAT_BIN "CLANG_FORMAT_BIN-NOTFOUND")
- endif()
+ if(NOT CLANG_TOOL_BIN)
+ # try searching for non-versioned tool and check the version
+ find_program(CLANG_TOOL_BIN
+ NAMES ${NAME}
+ PATHS ${CLANG_TOOLS_SEARCH_PATHS}
+ NO_DEFAULT_PATH)
+ if(CLANG_TOOL_BIN)
+ unset(CLANG_TOOL_VERSION_MESSAGE)
+ execute_process(COMMAND ${CLANG_TOOL_BIN} "-version"
+ OUTPUT_VARIABLE CLANG_TOOL_VERSION_MESSAGE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT (${CLANG_TOOL_VERSION_MESSAGE} MATCHES ${VERSION_CHECK_PATTERN}))
+ set(CLANG_TOOL_BIN "CLANG_TOOL_BIN-NOTFOUND")
endif()
endif()
endif()
+ if(CLANG_TOOL_BIN)
+ set(${OUTPUT} ${CLANG_TOOL_BIN} PARENT_SCOPE)
+ else()
+ set(${OUTPUT} "${OUTPUT}-NOTFOUND" PARENT_SCOPE)
+ endif()
+endfunction()
+find_clang_tool(clang-tidy CLANG_TIDY_BIN
+ "LLVM version ${ARROW_LLVM_MAJOR_VERSION}\\.${ARROW_LLVM_MINOR_VERSION}")
+if(CLANG_TIDY_BIN)
+ set(CLANG_TIDY_FOUND 1)
+ message(STATUS "clang-tidy found at ${CLANG_TIDY_BIN}")
+else()
+ set(CLANG_TIDY_FOUND 0)
+ message(STATUS "clang-tidy not found")
endif()
-if("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND")
- set(CLANG_FORMAT_FOUND 0)
- message(STATUS "clang-format not found")
-else()
+find_clang_tool(
+ clang-format CLANG_FORMAT_BIN
+ "^clang-format version ${ARROW_LLVM_MAJOR_VERSION}\\.${ARROW_LLVM_MINOR_VERSION}")
+if(CLANG_FORMAT_BIN)
set(CLANG_FORMAT_FOUND 1)
message(STATUS "clang-format found at ${CLANG_FORMAT_BIN}")
+else()
+ set(CLANG_FORMAT_FOUND 0)
+ message(STATUS "clang-format not found")
endif()
diff --git a/cpp/cmake_modules/FindLLVM.cmake b/cpp/cmake_modules/FindLLVM.cmake
index f2843e1..9126be0 100644
--- a/cpp/cmake_modules/FindLLVM.cmake
+++ b/cpp/cmake_modules/FindLLVM.cmake
@@ -20,23 +20,10 @@
# find_package(LLVM)
#
-if(APPLE)
- # Also look in homebrew for a matching llvm version
- find_program(BREW_BIN brew)
- if(BREW_BIN)
- execute_process(COMMAND ${BREW_BIN} --prefix "llvm@7"
- OUTPUT_VARIABLE LLVM_BREW_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
+set(LLVM_HINTS ${LLVM_ROOT} ${LLVM_DIR} /usr/lib /usr/share)
+if(LLVM_BREW_PREFIX)
+ list(APPEND LLVM_HINTS ${LLVM_BREW_PREFIX})
endif()
-
-set(LLVM_HINTS
- ${LLVM_ROOT}
- ${LLVM_DIR}
- /usr/lib
- /usr/local/opt/llvm
- /usr/share
- ${LLVM_BREW_PREFIX})
if(DEFINED ARROW_LLVM_VERSION_FALLBACK)
find_package(LLVM
${ARROW_LLVM_VERSION}
diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake
index dca5fbd..87cc24e 100644
--- a/cpp/cmake_modules/FindThrift.cmake
+++ b/cpp/cmake_modules/FindThrift.cmake
@@ -27,17 +27,6 @@
# THRIFT_STATIC_LIB, THRIFT static library
# THRIFT_FOUND, If false, do not try to use ant
-# TODO: Add this back to global
-if(APPLE)
- # Also look in homebrew for a matching llvm version
- find_program(BREW_BIN brew)
- if(BREW_BIN)
- execute_process(COMMAND ${BREW_BIN} --prefix "thrift"
- OUTPUT_VARIABLE THRIFT_BREW_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
-endif()
-
function(EXTRACT_THRIFT_VERSION)
exec_program(${THRIFT_COMPILER}
ARGS
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 56c1697..d37e440 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -922,6 +922,14 @@ if(PARQUET_REQUIRE_ENCRYPTION AND NOT ARROW_PARQUET)
set(PARQUET_REQUIRE_ENCRYPTION OFF)
endif()
set(ARROW_OPENSSL_REQUIRED_VERSION "1.0.2")
+if(BREW_BIN AND NOT OPENSSL_ROOT_DIR)
+ execute_process(COMMAND ${BREW_BIN} --prefix "openssl"
+ OUTPUT_VARIABLE OPENSSL_BREW_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(OPENSSL_BREW_PREFIX)
+ set(OPENSSL_ROOT_DIR ${OPENSSL_BREW_PREFIX})
+ endif()
+endif()
if(PARQUET_REQUIRE_ENCRYPTION OR ARROW_FLIGHT)
# This must work
find_package(OpenSSL ${ARROW_OPENSSL_REQUIRED_VERSION} REQUIRED)
@@ -1195,7 +1203,6 @@ macro(build_thrift)
# In the case where we cannot find a system-wide installation, look for
# homebrew and ask for its bison installation.
if(NOT BISON_FOUND)
- find_program(BREW_BIN brew)
if(BREW_BIN)
execute_process(COMMAND ${BREW_BIN} --prefix bison
OUTPUT_VARIABLE BISON_PREFIX