mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 00:56:31 +08:00
Code Activity

Twiddle rpath stuff, remove empty arrow_test_util module

Browse Source
This commit is contained in:
Wes McKinney committed 2016-03-09 12:43:15 -08:00
1 parent 8cca41aaee
commit 75545391c5
4 files changed
+12 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpp/CMakeLists.txt
+5 -10
View File
@@ -37,11 +37,6 @@ if ("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1")
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
endif()
if(APPLE)
# In newer versions of CMake, this is the default setting
set(CMAKE_MACOSX_RPATH 1)
endif()
find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
@@ -344,7 +339,7 @@ if(ARROW_BUILD_TESTS)
find_package(GTest REQUIRED)
include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
ADD_THIRDPARTY_LIB(gtest
STATIC_LIB ${GTEST_STATIC_LIB})
STATIC_LIB ${GTEST_STATIC_LIB})
endif()
## Google PerfTools
@@ -369,7 +364,7 @@ endif()
############################################################
# Linker setup
############################################################
set(ARROW_MIN_TEST_LIBS arrow arrow_test_main arrow_test_util ${ARROW_BASE_LIBS})
set(ARROW_MIN_TEST_LIBS arrow arrow_test_main ${ARROW_BASE_LIBS})
set(ARROW_TEST_LINK_LIBS ${ARROW_MIN_TEST_LIBS})
############################################################
@@ -469,13 +464,13 @@ if (APPLE)
set_target_properties(arrow
PROPERTIES
BUILD_WITH_INSTALL_RPATH ON
INSTALL_NAME_DIR "@rpath"
)
INSTALL_NAME_DIR "@rpath")
endif()
set_target_properties(arrow
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}")
LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}"
)
target_link_libraries(arrow ${LIBARROW_LINK_LIBS})
add_subdirectory(src/arrow)
cpp/src/arrow/CMakeLists.txt
+1 -1
View File
@@ -27,6 +27,6 @@ install(FILES
# Unit tests
#######################################
set(ARROW_TEST_LINK_LIBS arrow_test_util ${ARROW_MIN_TEST_LIBS})
set(ARROW_TEST_LINK_LIBS ${ARROW_MIN_TEST_LIBS})
ADD_ARROW_TEST(array-test)
cpp/src/arrow/util/CMakeLists.txt
-2
View File
@@ -39,14 +39,12 @@ if (ARROW_BUILD_TESTS)
if (APPLE)
target_link_libraries(arrow_test_main
gtest
arrow_test_util
dl)
set_target_properties(arrow_test_main
PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
else()
target_link_libraries(arrow_test_main
gtest
arrow_test_util
pthread
dl
)
python/CMakeLists.txt
+6 -5
View File
@@ -333,7 +333,7 @@ if (PYARROW_BUILD_TESTS)
find_package(GTest REQUIRED)
include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
ADD_THIRDPARTY_LIB(gtest
STATIC_LIB ${GTEST_STATIC_LIB})
STATIC_LIB ${GTEST_STATIC_LIB})
endif()
## Arrow
@@ -400,6 +400,10 @@ endif (UNIX)
# Subdirectories
############################################################
if (UNIX)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()
add_subdirectory(src/pyarrow)
add_subdirectory(src/pyarrow/util)
@@ -429,9 +433,6 @@ endif()
# Setup and build Cython modules
############################################################
set(USE_RELATIVE_RPATH ON)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(CYTHON_EXTENSIONS
array
config
@@ -472,7 +473,7 @@ foreach(module ${CYTHON_EXTENSIONS})
endwhile(${i} GREATER 0)
# for inplace development for now
set(module_install_rpath "${CMAKE_SOURCE_DIR}/pyarrow/")
# set(module_install_rpath "${CMAKE_SOURCE_DIR}/pyarrow/")
set_target_properties(${module_name} PROPERTIES
INSTALL_RPATH ${module_install_rpath})