Skip to content

ARROW-5653: [C++] Ensure testing libraries are not installed #4635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fsaintjacques wants to merge 2 commits into from
Closed

ARROW-5653: [C++] Ensure testing libraries are not installed #4635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f20d4
Remove extra libraries
fsaintjacques Jun 19, 2019
10f4e1f
ARROW-5633: [C++] Ensure testing libraries are not installed
fsaintjacques Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ci/docker_build_and_test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653
if [[ ! -z "${CONDA_PREFIX}" ]]; then
export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi
ninja unittest
popd
30 changes: 17 additions & 13 deletions cpp/cmake_modules/BuildUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ endfunction()

# \arg OUTPUTS list to append built targets to
function(ADD_ARROW_LIB LIB_NAME)
set(options BUILD_SHARED BUILD_STATIC)
set(options BUILD_SHARED BUILD_STATIC SKIP_INSTALL)
set(one_value_args SHARED_LINK_FLAGS)
set(multi_value_args
SOURCES
Expand Down Expand Up @@ -279,12 +279,14 @@ function(ADD_ARROW_LIB LIB_NAME)
"${_lib_install_name}")
endif()

install(TARGETS ${LIB_NAME}_shared ${INSTALL_IS_OPTIONAL}
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
if(NOT ARG_SKIP_INSTALL)
install(TARGETS ${LIB_NAME}_shared ${INSTALL_IS_OPTIONAL}
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
endif()
endif()

if(BUILD_STATIC)
Expand Down Expand Up @@ -329,12 +331,14 @@ function(ADD_ARROW_LIB LIB_NAME)
"$<BUILD_INTERFACE:${ARG_STATIC_LINK_LIBS}>"
"$<INSTALL_INTERFACE:${INTERFACE_LIBS}>")

install(TARGETS ${LIB_NAME}_static ${INSTALL_IS_OPTIONAL}
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
if(NOT ARG_SKIP_INSTALL)
install(TARGETS ${LIB_NAME}_static ${INSTALL_IS_OPTIONAL}
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
endif()
endif()

# Modify variable in calling scope
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ endif()
if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS OR ARROW_BUILD_INTEGRATION)
# that depend on gtest
add_arrow_lib(arrow_testing
SKIP_INSTALL
SOURCES
io/test-common.cc
ipc/test-common.cc
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/dataset/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ add_arrow_lib(arrow_dataset
arrow_static)

if(ARROW_DATASET_TEST_LINKAGE STREQUAL "static")
set(ARROW_DATASET_TEST_LINK_LIBS arrow_dataset_static ${ARROW_TEST_STATIC_LINK_LIBS})
set(ARROW_DATASET_TEST_LINK_LIBS arrow_dataset_static)
else()
set(ARROW_DATASET_TEST_LINK_LIBS arrow_dataset_shared ${ARROW_TEST_SHARED_LINK_LIBS})
set(ARROW_DATASET_TEST_LINK_LIBS arrow_dataset_shared)
endif()

foreach(LIB_TARGET ${ARROW_DATASET_LIBRARIES})
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/flight/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ endforeach()
# Define arrow_flight_testing library
if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS OR ARROW_BUILD_INTEGRATION)
add_arrow_lib(arrow_flight_testing
SKIP_INSTALL
OUTPUTS
ARROW_FLIGHT_TESTING_LIBRARIES
SOURCES
Expand Down