arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-680: [C++] Support CMake 2 or older again
Date Wed, 22 Mar 2017 15:04:47 GMT
Repository: arrow
Updated Branches:
  refs/heads/master b179ad2d8 -> 5fda24776


ARROW-680: [C++] Support CMake 2 or older again

GNUInstallDirs in CMake 2 always uses multiarch cared library directory.

See also: https://github.com/Kitware/CMake/commit/620939e4e6f5a61cd5c0fac2704de4bfda0eb7ef

Author: Kouhei Sutou <kou@clear-code.com>

Closes #419 from kou/cpp-support-cmake-2 and squashes the following commits:

684cb2b [Kouhei Sutou] [C++] Support CMake 2 or older again


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/5fda2477
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/5fda2477
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/5fda2477

Branch: refs/heads/master
Commit: 5fda24776d82cf120525d298ba261ddd02e5fcc8
Parents: b179ad2
Author: Kouhei Sutou <kou@clear-code.com>
Authored: Wed Mar 22 11:04:42 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed Mar 22 11:04:42 2017 -0400

----------------------------------------------------------------------
 cpp/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/5fda2477/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 84158cc..61e645d 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -28,7 +28,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
 
 include(CMakeParseArguments)
 include(ExternalProject)
-include(GNUInstallDirs)
+
+if(CMAKE_MAJOR_VERSION LESS 3)
+  set(CMAKE_INSTALL_INCLUDEDIR "include")
+  set(CMAKE_INSTALL_LIBDIR "lib")
+else()
+  include(GNUInstallDirs)
+endif()
 
 set(ARROW_SO_VERSION "0")
 set(ARROW_ABI_VERSION "${ARROW_SO_VERSION}.0.0")


Mime
View raw message