aboutsummaryrefslogtreecommitdiff
path: root/third-party/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'third-party/cmake')
-rw-r--r--third-party/cmake/BuildJeMalloc.cmake19
-rw-r--r--third-party/cmake/BuildLuarocks.cmake7
2 files changed, 23 insertions, 3 deletions
diff --git a/third-party/cmake/BuildJeMalloc.cmake b/third-party/cmake/BuildJeMalloc.cmake
new file mode 100644
index 0000000000..ceb7de41e9
--- /dev/null
+++ b/third-party/cmake/BuildJeMalloc.cmake
@@ -0,0 +1,19 @@
+ExternalProject_Add(jemalloc
+ PREFIX ${DEPS_BUILD_DIR}
+ URL ${JEMALLOC_URL}
+ DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/jemalloc
+ DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+ -DPREFIX=${DEPS_BUILD_DIR}
+ -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/jemalloc
+ -DURL=${JEMALLOC_URL}
+ -DEXPECTED_SHA256=${JEMALLOC_SHA256}
+ -DTARGET=jemalloc
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+ BUILD_IN_SOURCE 1
+ CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/jemalloc/autogen.sh &&
+ ${DEPS_BUILD_DIR}/src/jemalloc/configure --with-jemalloc-prefix=je_
+ --enable-cc-silence CC=${DEPS_C_COMPILER} --prefix=${DEPS_INSTALL_DIR}
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ${MAKE_PRG} install_include install_lib)
+
+list(APPEND THIRD_PARTY_DEPS jemalloc)
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index baa3425918..fabceac3d8 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -56,9 +56,10 @@ add_custom_target(stable-busted-deps
add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted
COMMAND ${DEPS_BIN_DIR}/luarocks
- ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/master/busted-scm-0.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
- COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/utfTerminalDetailed.lua
- ${DEPS_INSTALL_DIR}/share/lua/5.1/busted/outputHandlers
+ ## Drop back to:
+ ## https://raw.githubusercontent.com/Olivine-Labs/busted/master/busted-scm-0.rockspec
+ ## once the spec file is fixed in busted.
+ ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/f803173cc136f7370f7416254eaf3bada01b04a9/busted-scm-0.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
DEPENDS stable-busted-deps)
add_custom_target(busted
DEPENDS ${DEPS_BIN_DIR}/busted)