From 4634f0ff2e6fea88dcf027aa89ccb8c8ad4f58c9 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Tue, 27 Dec 2022 13:47:49 +0800 Subject: [PATCH] fit for ninja generator (#49303) --- cmake/external/jemalloc.cmake | 4 ++-- cmake/external/rocksdb.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/external/jemalloc.cmake b/cmake/external/jemalloc.cmake index efce686b209..8a2dc0e60a2 100644 --- a/cmake/external/jemalloc.cmake +++ b/cmake/external/jemalloc.cmake @@ -21,9 +21,9 @@ ExternalProject_Add( URL ${JEMALLOC_URL} INSTALL_DIR ${JEMALLOC_INSTALL} DOWNLOAD_DIR "${JEMALLOC_DOWNLOAD_DIR}" - BUILD_COMMAND $(MAKE) + BUILD_COMMAND make BUILD_IN_SOURCE 1 - INSTALL_COMMAND $(MAKE) install + INSTALL_COMMAND make install CONFIGURE_COMMAND "${JEMALLOC_DOWNLOAD_DIR}/configure" --prefix=${JEMALLOC_INSTALL} --disable-initial-exec-tls) diff --git a/cmake/external/rocksdb.cmake b/cmake/external/rocksdb.cmake index 8ad2bf1e2e8..f2bca6fea63 100644 --- a/cmake/external/rocksdb.cmake +++ b/cmake/external/rocksdb.cmake @@ -75,6 +75,7 @@ ExternalProject_Add( add_library(rocksdb STATIC IMPORTED GLOBAL) add_dependencies(extern_rocksdb snappy) +add_dependencies(extern_rocksdb extern_jemalloc) set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION ${ROCKSDB_LIBRARIES}) add_dependencies(rocksdb extern_rocksdb) -- GitLab