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 65f5add ARROW-1944: [C++] Fix ARROW_STATIC_LIB in FindArrow
65f5add is described below
commit 65f5add61829bd413aa8175ad2644cdd362d0c50
Author: Philipp Moritz <[email protected]>
AuthorDate: Thu Dec 21 18:05:15 2017 -0500
ARROW-1944: [C++] Fix ARROW_STATIC_LIB in FindArrow
Author: Philipp Moritz <[email protected]>
Closes #1440 from pcmoritz/findarrow-libs-fix and squashes the following
commits:
bb161b4d [Philipp Moritz] fix static lib path in FindArrow
---
cpp/cmake_modules/FindArrow.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpp/cmake_modules/FindArrow.cmake
b/cpp/cmake_modules/FindArrow.cmake
index 12f76b6..bce4404 100644
--- a/cpp/cmake_modules/FindArrow.cmake
+++ b/cpp/cmake_modules/FindArrow.cmake
@@ -97,8 +97,8 @@ if (ARROW_INCLUDE_DIR AND ARROW_LIBS)
set(ARROW_SHARED_IMP_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}.lib)
set(ARROW_PYTHON_SHARED_IMP_LIB
${ARROW_PYTHON_LIBS}/${ARROW_PYTHON_LIB_NAME}.lib)
else()
- set(ARROW_STATIC_LIB ${ARROW_PYTHON_LIB_PATH}/lib${ARROW_LIB_NAME}.a)
- set(ARROW_PYTHON_STATIC_LIB
${ARROW_PYTHON_LIB_PATH}/lib${ARROW_PYTHON_LIB_NAME}.a)
+ set(ARROW_STATIC_LIB ${ARROW_LIBS}/lib${ARROW_LIB_NAME}.a)
+ set(ARROW_PYTHON_STATIC_LIB ${ARROW_LIBS}/lib${ARROW_PYTHON_LIB_NAME}.a)
set(ARROW_SHARED_LIB
${ARROW_LIBS}/lib${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ARROW_PYTHON_SHARED_LIB
${ARROW_LIBS}/lib${ARROW_PYTHON_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
