[
https://issues.apache.org/jira/browse/ARROW-1742?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16239175#comment-16239175
]
ASF GitHub Bot commented on ARROW-1742:
---------------------------------------
wesm closed pull request #1281: ARROW-1742: C++: clang-format is not detected
correct on OSX anymore
URL: https://github.com/apache/arrow/pull/1281
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index d8dc5df88..5f0c431d5 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -48,6 +48,7 @@ set(ARROW_ABI_VERSION "${ARROW_SO_VERSION}.0.0")
set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support")
+set(CLANG_FORMAT_VERSION "4.0")
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
@@ -435,11 +436,9 @@ endif (UNIX)
# "make format" and "make check-format" targets
############################################################
-set(CLANG_FORMAT_VERSION 4.0)
-
# runs clang format and updates files in place.
add_custom_target(format ${BUILD_SUPPORT_DIR}/run_clang_format.py
- ${CLANG_FORMAT_VERSION}
+ ${CLANG_FORMAT_BIN}
${BUILD_SUPPORT_DIR}/clang_format_exclusions.txt
${CMAKE_CURRENT_SOURCE_DIR}/src)
@@ -447,7 +446,7 @@ add_custom_target(format
${BUILD_SUPPORT_DIR}/run_clang_format.py
# TODO(wesm): Make this work in run_clang_format.py
add_custom_target(check-format ${BUILD_SUPPORT_DIR}/run_clang_format.py
- ${CLANG_FORMAT_VERSION}
+ ${CLANG_FORMAT_BIN}
${BUILD_SUPPORT_DIR}/clang_format_exclusions.txt
${CMAKE_CURRENT_SOURCE_DIR}/src 1)
diff --git a/cpp/build-support/run_clang_format.py
b/cpp/build-support/run_clang_format.py
index fcf39ecc6..6dec34bd0 100755
--- a/cpp/build-support/run_clang_format.py
+++ b/cpp/build-support/run_clang_format.py
@@ -27,7 +27,7 @@
sys.argv[0])
sys.exit(1)
-CLANG_FORMAT = 'clang-format-{0}'.format(sys.argv[1])
+CLANG_FORMAT = sys.argv[1]
EXCLUDE_GLOBS_FILENAME = sys.argv[2]
SOURCE_DIR = sys.argv[3]
diff --git a/cpp/cmake_modules/FindClangTools.cmake
b/cpp/cmake_modules/FindClangTools.cmake
index 0e9430ba2..e9221ff22 100644
--- a/cpp/cmake_modules/FindClangTools.cmake
+++ b/cpp/cmake_modules/FindClangTools.cmake
@@ -49,16 +49,47 @@ else()
message("clang-tidy found at ${CLANG_TIDY_BIN}")
endif()
-find_program(CLANG_FORMAT_BIN
- NAMES clang-format-4.0
- clang-format-3.9
- clang-format-3.8
- clang-format-3.7
- clang-format-3.6
- clang-format
- PATHS ${ClangTools_PATH} $ENV{CLANG_TOOLS_PATH} /usr/local/bin /usr/bin
- NO_DEFAULT_PATH
-)
+if (CLANG_FORMAT_VERSION)
+ find_program(CLANG_FORMAT_BIN
+ NAMES clang-format-${CLANG_FORMAT_VERSION}
+ PATHS
+ ${ClangTools_PATH}
+ $ENV{CLANG_TOOLS_PATH}
+ /usr/local/bin /usr/bin
+ NO_DEFAULT_PATH
+ )
+
+ # If not found yet, search alternative locations
+ if (("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND") AND APPLE)
+ # Homebrew ships older LLVM versions in /usr/local/opt/llvm@version/
+ STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+" "\\1"
CLANG_FORMAT_MAJOR_VERSION "${CLANG_FORMAT_VERSION}")
+ STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)" "\\1"
CLANG_FORMAT_MINOR_VERSION "${CLANG_FORMAT_VERSION}")
+ if ("${CLANG_FORMAT_MINOR_VERSION}" STREQUAL "0")
+ find_program(CLANG_FORMAT_BIN
+ NAMES clang-format
+ PATHS /usr/local/opt/llvm@${CLANG_FORMAT_MAJOR_VERSION}/bin
+ NO_DEFAULT_PATH
+ )
+ else()
+ find_program(CLANG_FORMAT_BIN
+ NAMES clang-format
+ PATHS /usr/local/opt/llvm@${CLANG_FORMAT_VERSION}/bin
+ NO_DEFAULT_PATH
+ )
+ endif()
+ endif()
+else()
+ find_program(CLANG_FORMAT_BIN
+ NAMES clang-format-4.0
+ clang-format-3.9
+ clang-format-3.8
+ clang-format-3.7
+ clang-format-3.6
+ clang-format
+ PATHS ${ClangTools_PATH} $ENV{CLANG_TOOLS_PATH} /usr/local/bin /usr/bin
+ NO_DEFAULT_PATH
+ )
+endif()
if ( "${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND" )
set(CLANG_FORMAT_FOUND 0)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> C++: clang-format is not detected correct on OSX anymore
> --------------------------------------------------------
>
> Key: ARROW-1742
> URL: https://issues.apache.org/jira/browse/ARROW-1742
> Project: Apache Arrow
> Issue Type: Bug
> Affects Versions: 0.7.1
> Reporter: Uwe L. Korn
> Assignee: Uwe L. Korn
> Priority: Major
> Labels: pull-request-available
> Fix For: 0.8.0
>
>
> Paths changed slightly in recent homebrew builds. We need to adjust our
> script to call the correct executable again.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
