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 d655035 ARROW-4878: [C++] Append \Library to CONDA_PREFIX when using
ARROW_DEPENDENCY_SOURCE=CONDA
d655035 is described below
commit d655035f5a1d8e42303eb61d2a6b698792e481e5
Author: Wes McKinney <[email protected]>
AuthorDate: Fri Mar 15 08:40:17 2019 -0500
ARROW-4878: [C++] Append \Library to CONDA_PREFIX when using
ARROW_DEPENDENCY_SOURCE=CONDA
Not sure how this made it through CI
Author: Wes McKinney <[email protected]>
Closes #3910 from wesm/ARROW-4878 and squashes the following commits:
cfa313216 <Wes McKinney> Remove use of ARROW_BUILD_TOOLCHAIN
ecb52712f <Wes McKinney> remove debugging statement
8a7ba8dfb <Wes McKinney> Set package prefix with \Library on Windows when
using ARROW_DEPENDENCY_SOURCE=AUTO
---
ci/cpp-msvc-build-main.bat | 1 -
cpp/cmake_modules/ThirdpartyToolchain.cmake | 30 +++++++++++++----------------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/ci/cpp-msvc-build-main.bat b/ci/cpp-msvc-build-main.bat
index 97ed401..29782af 100644
--- a/ci/cpp-msvc-build-main.bat
+++ b/ci/cpp-msvc-build-main.bat
@@ -28,7 +28,6 @@ if "%JOB%" == "Toolchain" (
-DARROW_WITH_BZ2=ON ^
-DARROW_DEPENDENCY_SOURCE=CONDA ^
-DGTest_SOURCE=BUNDLED
- set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
) else (
@rem We're in a conda enviroment but don't want to use it for the
dependencies
set CMAKE_ARGS=%CMAKE_ARGE% -DARROW_DEPENDENCY_SOURCE=AUTO
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 89fd7a6..3fce0b7 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -61,7 +61,11 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
# TODO: double-conversion check fails for conda, it should not
if(ARROW_DEPENDENCY_SOURCE STREQUAL "CONDA")
message(STATUS "Using CONDA_PREFIX: $ENV{CONDA_PREFIX}")
- set(ARROW_PACKAGE_PREFIX $ENV{CONDA_PREFIX})
+ if (MSVC)
+ set(ARROW_PACKAGE_PREFIX "$ENV{CONDA_PREFIX}/Library")
+ else()
+ set(ARROW_PACKAGE_PREFIX $ENV{CONDA_PREFIX})
+ endif()
set(ARROW_ACTUAL_DEPENDENCY_SOURCE "SYSTEM")
endif()
@@ -69,13 +73,14 @@ if (ARROW_PACKAGE_PREFIX)
message(STATUS "Setting (unset) dependency *_ROOT variables:
${ARROW_PACKAGE_PREFIX}")
set(ENV{PKG_CONFIG_PATH} "${ARROW_PACKAGE_PREFIX}/lib/pkgconfig/")
- if (NOT MSVC)
- if (NOT ENV{BOOST_ROOT})
- set(ENV{BOOST_ROOT} ${ARROW_PACKAGE_PREFIX})
- endif()
- if (NOT Boost_ROOT})
- set(ENV{Boost_ROOT} ${ARROW_PACKAGE_PREFIX})
- endif()
+ if (NOT BOOST_ROOT)
+ set(BOOST_ROOT ${ARROW_PACKAGE_PREFIX})
+ endif()
+ if (NOT ENV{BOOST_ROOT})
+ set(ENV{BOOST_ROOT} ${ARROW_PACKAGE_PREFIX})
+ endif()
+ if (NOT ENV{Boost_ROOT})
+ set(ENV{Boost_ROOT} ${ARROW_PACKAGE_PREFIX})
endif()
foreach(DEPENDENCY ${ARROW_THIRDPARTY_DEPENDENCIES})
@@ -1144,14 +1149,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
# set(CMAKE_REQUIRED_LIBRARIES)
endif()
- get_property(GTEST_LOCATION TARGET GTest::GTest
- PROPERTY LOCATION)
- get_property(GMOCK_LOCATION TARGET GTest::GMock
- PROPERTY LOCATION)
-
- message(STATUS "Using gtest library at ${GTEST_LOCATION}")
- message(STATUS "Using gmock library at ${GMOCK_LOCATION}")
-
# TODO: Don't use global includes but rather target_include_directories
get_target_property(GTEST_INCLUDE_DIR GTest::GTest
INTERFACE_INCLUDE_DIRECTORIES)
include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
@@ -1796,7 +1793,6 @@ if (ARROW_WITH_GRPC)
endif()
endif()
-
# ----------------------------------------------------------------------
# Add Boost dependencies (code adapted from Apache Kudu (incubating))
