tjh.dev
1diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake
2index aeb78d9..e9d4e6b 100644
3--- a/helio/cmake/third_party.cmake
4+++ b/helio/cmake/third_party.cmake
5@@ -143,7 +143,7 @@ endfunction()
6
7 FetchContent_Declare(
8 gtest
9- URL https://github.com/google/googletest/archive/release-1.11.0.zip
10+ DOWNLOAD_COMMAND true
11 )
12
13 FetchContent_GetProperties(gtest)
14@@ -154,7 +154,7 @@ endif ()
15
16 FetchContent_Declare(
17 benchmark
18- URL https://github.com/google/benchmark/archive/v1.6.1.tar.gz
19+ DOWNLOAD_COMMAND true
20 )
21
22 FetchContent_GetProperties(benchmark)
23@@ -169,7 +169,7 @@ endif ()
24
25 FetchContent_Declare(
26 abseil_cpp
27- URL https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz
28+ DOWNLOAD_COMMAND true
29 PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20211102.patch"
30 )
31
32@@ -183,11 +183,7 @@ endif()
33
34 FetchContent_Declare(
35 glog
36- GIT_REPOSITORY https://github.com/romange/glog
37- GIT_TAG Absl
38-
39- GIT_PROGRESS TRUE
40- GIT_SHALLOW TRUE
41+ DOWNLOAD_COMMAND true
42 )
43
44 FetchContent_GetProperties(glog)
45@@ -233,10 +229,7 @@ endif()
46
47 add_third_party(
48 gperf
49- URL https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz
50- #GIT_REPOSITORY https://github.com/gperftools/gperftools
51- #GIT_TAG gperftools-2.9.1
52- GIT_SHALLOW TRUE
53+ DOWNLOAD_COMMAND true
54 PATCH_COMMAND autoreconf -i # update runs every time for some reason
55 # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \
56 # -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF \
57@@ -260,11 +253,12 @@ else()
58 endif()
59
60 add_third_party(mimalloc
61- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz
62+ DOWNLOAD_COMMAND true
63
64 # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug
65 CMAKE_PASS_FLAGS "-DCMAKE_BUILD_TYPE=Release -DMI_BUILD_SHARED=OFF -DMI_BUILD_TESTS=OFF \
66- -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g"
67+ -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g \
68+ -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/mimalloc/lib"
69
70 BUILD_COMMAND make -j4 mimalloc-static
71 INSTALL_COMMAND make install
72@@ -274,7 +268,7 @@ add_third_party(mimalloc
73 )
74
75 add_third_party(jemalloc
76- URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
77+ URL REPLACEJEMALLOCURL
78 PATCH_COMMAND ./autogen.sh
79 CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl
80 )
81@@ -282,24 +276,23 @@ add_third_party(jemalloc
82
83 add_third_party(
84 xxhash
85- URL https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz
86+ DOWNLOAD_COMMAND true
87 SOURCE_SUBDIR cmake_unofficial
88- CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF"
89+ CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF \
90+ -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/xxhash/lib"
91 )
92
93
94 add_third_party(
95 uring
96- GIT_REPOSITORY https://github.com/axboe/liburing.git
97- GIT_TAG liburing-2.1
98+ DOWNLOAD_COMMAND true
99 CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring
100 BUILD_IN_SOURCE 1
101 )
102
103 add_third_party(
104 rapidjson
105- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
106- GIT_TAG 1a803826f1197b5e30703afe4b9c0e7dd48074f5
107+ DOWNLOAD_COMMAND true
108 CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
109 -DRAPIDJSON_BUILD_DOC=OFF"
110 LIB "none"
111diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
112index 0dc0824..d5b38b3 100644
113--- a/src/CMakeLists.txt
114+++ b/src/CMakeLists.txt
115@@ -1,6 +1,6 @@
116 add_third_party(
117 lua
118- URL https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz
119+ URL REPLACELUAURL
120 PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/lua-v5.4.4.patch"
121 CONFIGURE_COMMAND echo
122 BUILD_IN_SOURCE 1
123@@ -11,7 +11,8 @@ add_third_party(
124
125 add_third_party(
126 dconv
127- URL https://github.com/google/double-conversion/archive/refs/tags/v3.2.0.tar.gz
128+ DOWNLOAD_COMMAND true
129+ CMAKE_PASS_FLAGS "-DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/dconv/lib"
130 LIB libdouble-conversion.a
131 )
132