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-1302: C++: Set MAKE to make if not defined
Date Tue, 29 Aug 2017 22:07:13 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 19bbf12a2 -> 6af29317b


ARROW-1302: C++: Set MAKE to make if not defined

Author: Uwe L. Korn <uwelk@xhochy.com>

Closes #1010 from xhochy/ARROW-1302 and squashes the following commits:

72fe9e5f [Uwe L. Korn] Only search for make on unix systems
95d3a310 [Uwe L. Korn] Use find_program to find make
b7b169e5 [Uwe L. Korn] ARROW-1302: C++: Set MAKE to make if not defined


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

Branch: refs/heads/master
Commit: 6af29317b22b31639e4796824266384f9d53abf7
Parents: 19bbf12
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Tue Aug 29 18:07:09 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Tue Aug 29 18:07:09 2017 -0400

----------------------------------------------------------------------
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/6af29317/cpp/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index a888e92..e5d38b5 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -105,6 +105,13 @@ if (DEFINED ENV{ZSTD_HOME})
   set(ZSTD_HOME "$ENV{ZSTD_HOME}")
 endif()
 
+# Ensure that a default make is set
+if ("${MAKE}" STREQUAL "")
+    if (NOT MSVC)
+        find_program(MAKE make)
+    endif()
+endif()
+
 # ----------------------------------------------------------------------
 # Find pthreads
 


Mime
View raw message