[arrow] branch master updated: ARROW-3397: [C++] Change a CMake relative path for modules

[wesm]

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 b5e9cc5  ARROW-3397: [C++] Change a CMake relative path for modules
b5e9cc5 is described below

commit b5e9cc5a6a115ddb2544227b342e2f0dc620277c
Author: luc1ph3r <electrocartri...@gmail.com>
AuthorDate: Mon Oct 1 17:03:46 2018 -0400

    ARROW-3397: [C++] Change a CMake relative path for modules
    
    Change the path of the modules to support Arrow inclusion to other
    CMake projects
    
    Author: luc1ph3r <electrocartri...@gmail.com>
    
    Closes #2676 from luc1ph3r/cmake-support-project-inclusion and squashes the 
following commits:
    
    dac057219 <luc1ph3r> : Make a CMake modules path less error-prone
    11c4d1901 <luc1ph3r> : Change a CMake relative path
---
 cpp/CMakeLists.txt                          | 2 +-
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index ad231fa..4448b98 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -51,7 +51,7 @@ message(STATUS "Arrow version: "
   "(full: '${ARROW_VERSION}')")
 
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
 
 include(CMakeParseArguments)
 include(ExternalProject)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 91f4fb0..1c7cd62 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------
 # Thirdparty versions, environment variables, source URLs
 
-set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty")
+set(THIRDPARTY_DIR "${arrow_SOURCE_DIR}/thirdparty")
 
 if (NOT "$ENV{ARROW_BUILD_TOOLCHAIN}" STREQUAL "")
   set(BROTLI_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")