From 997a9b9b99f386f9a506e74be55cdbc9c7ff4818 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Fri, 1 Jul 2022 09:49:28 +0200 Subject: [PATCH] Comments and names changes --- cpp/cmake_modules/FindArrowPython.cmake | 2 +- cpp/src/arrow/public_api_test.cc | 4 ---- python/pyarrow/src_arrow/CMakeLists.txt | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cpp/cmake_modules/FindArrowPython.cmake b/cpp/cmake_modules/FindArrowPython.cmake index 15d15def782af..1d8c7d3f40e29 100644 --- a/cpp/cmake_modules/FindArrowPython.cmake +++ b/cpp/cmake_modules/FindArrowPython.cmake @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -# - Find Arrow Python (python/pyarrrow/src_arrow/api.h, libarrow_python.a, libarrow_python.so) +# - Find Arrow Python (arrow/python/api.h, libarrow_python.a, libarrow_python.so) # # This module requires Arrow from which it uses # arrow_find_package() diff --git a/cpp/src/arrow/public_api_test.cc b/cpp/src/arrow/public_api_test.cc index 309d2b77f96d6..a2aa624d0928a 100644 --- a/cpp/src/arrow/public_api_test.cc +++ b/cpp/src/arrow/public_api_test.cc @@ -50,10 +50,6 @@ #include "arrow/json/api.h" // IWYU pragma: keep #endif -// #ifdef ARROW_PYTHON -// #include "arrow/python/api.h" // IWYU pragma: keep -// #endif - #ifdef DCHECK #error "DCHECK should not be visible from Arrow public headers." #endif diff --git a/python/pyarrow/src_arrow/CMakeLists.txt b/python/pyarrow/src_arrow/CMakeLists.txt index 77ea618980ffe..6bba2024cee3a 100644 --- a/python/pyarrow/src_arrow/CMakeLists.txt +++ b/python/pyarrow/src_arrow/CMakeLists.txt @@ -33,10 +33,10 @@ endif() # CMAKE_MODULE_PATH: location of cmake_modules in python # -get_filename_component(PYARROW_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY) -get_filename_component(PYTHON_SOURCE_DIR ${PYARROW_SOURCE_DIR} DIRECTORY) -get_filename_component(ARROW_SOURCE ${PYTHON_SOURCE_DIR} DIRECTORY) -set(ARROW_SOURCE_DIR "${ARROW_SOURCE}/cpp") +get_filename_component(ARROW_PYTHON_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY) +get_filename_component(PYARROW_SOURCE_DIR ${ARROW_PYTHON_SOURCE_DIR} DIRECTORY) +get_filename_component(ARROW_SOURCE_DIR ${PYARROW_SOURCE_DIR} DIRECTORY) +set(ARROW_CPP_SOURCE_DIR "${ARROW_SOURCE_DIR}/cpp") # normalize ARROW_HOME path cmake_path(CONVERT "$ENV{ARROW_HOME}" TO_CMAKE_PATH_LIST ARROW_HOME)