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-1169: [C++] jemalloc externalproject doesn't build with CMake's ninja generator
Date Sat, 01 Jul 2017 22:07:17 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 456330f6d -> 930db87d6


ARROW-1169: [C++] jemalloc externalproject doesn't build with CMake's ninja generator

Closes #796

Change-Id: I3cbd06d774feca254183e0ed1b0e75111f7cb389


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

Branch: refs/heads/master
Commit: 930db87d63571756118c6edc2e4df3a678d92393
Parents: 456330f
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Thu Jun 29 23:27:02 2017 +0200
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Sat Jul 1 18:06:45 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/arrow/blob/930db87d/cpp/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 8da2087..8573345 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -407,16 +407,16 @@ if (ARROW_JEMALLOC)
         URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2
         CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix="
         BUILD_IN_SOURCE 1
-        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+        BUILD_COMMAND ${MAKE}
         BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}"
-        INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} -j1 install)
+        INSTALL_COMMAND ${MAKE} -j1 install)
     else()
       ExternalProject_Add(jemalloc_ep
         URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2
         CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix="
         BUILD_IN_SOURCE 1
-        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
-        INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} -j1 install)
+        BUILD_COMMAND ${MAKE}
+        INSTALL_COMMAND ${MAKE} -j1 install)
     endif()
   else()
     set(JEMALLOC_VENDORED 0)


Mime
View raw message