File: 0003-remove-cmake-downloads.patch

package info (click to toggle)
sol2 3.5.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 23,096 kB
  • sloc: cpp: 43,816; ansic: 1,018; python: 356; sh: 288; makefile: 202
file content (342 lines) | stat: -rw-r--r-- 12,393 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
Description: Remove cmake downloads
 Make sure cmake is not downloading/vendoring anything
Forwarded: not-needed
Author: syzygial <syzygial.123@gmail.com>
Last-Update: 2025-05-30
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b54f71a..066707c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ include(CMakePackageConfigHelpers)
 include(CheckCXXCompilerFlag)
 include(CMakeDependentOption)
 include(GNUInstallDirs)
-include(FetchContent)
 
 # # # Configuration
 # # Cached defines, strings, paths and options
diff --git a/cmake/Includes/Project.cmake b/cmake/Includes/Project.cmake
index e7c8d7a..07ff0d1 100644
--- a/cmake/Includes/Project.cmake
+++ b/cmake/Includes/Project.cmake
@@ -44,7 +44,6 @@ include(CMakeDependentOption)
 include(CMakePrintHelpers)
 include(GNUInstallDirs)
 include(FeatureSummary)
-include(FetchContent)
 include(CTest)
 # sol2
 include(CheckCompilerDiagnostic)
diff --git a/cmake/Packages/FindKaguyaBuild.cmake b/cmake/Packages/FindKaguyaBuild.cmake
index 8d0579f..2d3453b 100644
--- a/cmake/Packages/FindKaguyaBuild.cmake
+++ b/cmake/Packages/FindKaguyaBuild.cmake
@@ -21,7 +21,6 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-include(ExternalProject)
 include(FindPackageHandleStandardArgs)
 include(Common/Core)
 
@@ -37,29 +36,7 @@ set(kaguya_include_dirs "${kaguya_build_toplevel}/include")
 set(kaguya_sources kaguya/kaguya.hpp)
 prepend(kaguya_sources "${kaguya_build_toplevel}/include/" ${kaguya_sources})
 
-# # External project to get sources
-ExternalProject_Add(KAGUYA_BUILD_SOURCE
-	BUILD_IN_SOURCE TRUE
-	BUILD_ALWAYS FALSE
-	# # Use Git to get what we need
-	GIT_SHALLOW TRUE
-	GIT_SUBMODULES ""
-	GIT_REPOSITORY https://github.com/satoren/kaguya.git
-	GIT_TAG main
-	PREFIX ${kaguya_build_toplevel}
-	SOURCE_DIR ${kaguya_build_toplevel}
-	DOWNLOAD_DIR ${kaguya_build_toplevel}
-	TMP_DIR "${kaguya_build_toplevel}-tmp"
-	STAMP_DIR "${kaguya_build_toplevel}-stamp"
-	INSTALL_DIR "${kaguya_build_toplevel}/local"
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	BUILD_BYPRODUCTS "${kaguya_sources}")
-
 add_library(${kaguya_lib} INTERFACE)
-add_dependencies(${kaguya_lib} KAGUYA_BUILD_SOURCE)
 target_include_directories(${kaguya_lib} INTERFACE ${kaguya_include_dirs})
 target_link_libraries(${kaguya_lib} INTERFACE Lua::Lua)
 if (NOT MSVC)
diff --git a/cmake/Packages/FindLuaBridgeBuild.cmake b/cmake/Packages/FindLuaBridgeBuild.cmake
index 1ee9165..77fc1be 100644
--- a/cmake/Packages/FindLuaBridgeBuild.cmake
+++ b/cmake/Packages/FindLuaBridgeBuild.cmake
@@ -20,7 +20,6 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-include(ExternalProject)
 include(FindPackageHandleStandardArgs)
 include(Common/Core)
 
@@ -36,28 +35,7 @@ set(luabridge_include_dirs "${luabridge_build_toplevel}/Source")
 set(luabridge_sources LuaBridge/LuaBridge.h)
 prepend(luabridge_sources "${luabridge_build_toplevel}/Source/" ${luabridge_sources})
 
-# # External project to get sources
-ExternalProject_Add(LUABRIDGE_BUILD_SOURCE
-	BUILD_IN_SOURCE TRUE
-	BUILD_ALWAYS FALSE
-	# # Use Git to get what we need
-	GIT_SHALLOW TRUE
-	GIT_SUBMODULES ""
-	GIT_REPOSITORY https://github.com/ThePhD/LuaBridge.git
-	PREFIX ${luabridge_build_toplevel}
-	SOURCE_DIR ${luabridge_build_toplevel}
-	DOWNLOAD_DIR ${luabridge_build_toplevel}
-	TMP_DIR "${luabridge_build_toplevel}-tmp"
-	STAMP_DIR "${luabridge_build_toplevel}-stamp"
-	INSTALL_DIR "${luabridge_build_toplevel}/local"
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	BUILD_BYPRODUCTS "${luabridge_sources}")
-
 add_library(${luabridge_lib} INTERFACE)
-add_dependencies(${luabridge_lib} LUABRIDGE_BUILD_SOURCE)
 target_include_directories(${luabridge_lib} INTERFACE ${luabridge_include_dirs})
 target_link_libraries(${luabridge_lib} INTERFACE Lua::Lua)
 if (NOT MSVC)
diff --git a/cmake/Packages/FindLuaBuild/LuaJIT.cmake b/cmake/Packages/FindLuaBuild/LuaJIT.cmake
index a2ea2a6..592d44a 100644
--- a/cmake/Packages/FindLuaBuild/LuaJIT.cmake
+++ b/cmake/Packages/FindLuaBuild/LuaJIT.cmake
@@ -26,9 +26,6 @@ if(lua_jit_build_included)
 endif(lua_jit_build_included)
 set(lua_jit_build_included true)
 
-# import necessary standard modules
-include(ExternalProject)
-
 # MD5 hashes taken off of LuaJIT's website
 # must be updated whenever a new version appears
 set(LUA_JIT_MD5_2.1.0-beta3.tar.gz eae40bc29d06ee5e3078f9444fcea39b)
@@ -397,63 +394,6 @@ if (LUAJIT_BUILD_LOCAL_DIR)
 	add_custom_target(LUA_JIT-move
 		DEPENDS LUA_JIT-bat-build ${LUA_JIT_INSTALL_BYPRODUCTS}
 	)
-elseif (LUA_JIT_GIT_COMMIT OR LUA_JIT_PULL_LATEST)
-	if (LUA_JIT_PULL_LATEST)
-		MESSAGE(STATUS "Latest LuaJIT has been requested: pulling from git...")
-	elseif (LUA_JIT_GIT_COMMIT)
-		MESSAGE(STATUS "LuaJIT '${LUA_VERSION}' requested has broken static library builds: using git '${LUA_JIT_GIT_COMMIT}'...")
-		set(LUA_JIT_GIT_TAG GIT_TAG ${LUA_JIT_GIT_COMMIT})
-	endif()
-	ExternalProject_Add(LUA_JIT
-		BUILD_IN_SOURCE TRUE
-		BUILD_ALWAYS FALSE
-		PREFIX "${LUA_BUILD_TOPLEVEL}"
-		SOURCE_DIR "${LUA_BUILD_TOPLEVEL}"
-		DOWNLOAD_DIR "${LUA_BUILD_TOPLEVEL}"
-		TMP_DIR "${LUA_BUILD_TOPLEVEL}-tmp"
-		STAMP_DIR "${LUA_BUILD_TOPLEVEL}-stamp"
-		INSTALL_DIR "${LUA_BUILD_INSTALL_DIR}"
-		GIT_REPOSITORY https://github.com/LuaJIT/LuaJIT.git
-		GIT_REMOTE_NAME origin
-		${LUA_JIT_GIT_TAG}
-		GIT_SHALLOW TRUE
-		CONFIGURE_COMMAND ""
-		${LUA_JIT_BUILD_COMMAND}
-		INSTALL_COMMAND ""
-		TEST_COMMAND ""
-		BUILD_BYPRODUCTS ${LUA_JIT_BYPRODUCTS})
-else()
-	ExternalProject_Add(LUA_JIT
-		BUILD_IN_SOURCE TRUE
-		BUILD_ALWAYS TRUE
-		# LuaJIT does not offer a TLS/SSL port
-		TLS_VERIFY FALSE
-		PREFIX "${LUA_BUILD_TOPLEVEL}"
-		SOURCE_DIR "${LUA_BUILD_TOPLEVEL}"
-		DOWNLOAD_DIR "${LUA_BUILD_TOPLEVEL}"
-		TMP_DIR "${LUA_BUILD_TOPLEVEL}-tmp"
-		STAMP_DIR "${LUA_BUILD_TOPLEVEL}-stamp"
-		INSTALL_DIR "${LUA_BUILD_INSTALL_DIR}"
-		URL "${LUA_JIT_DOWNLOAD_URI}"
-		${LUA_JIT_DOWNLOAD_MD5_COMMAND}
-		${LUA_JIT_DOWNLOAD_SHA1_COMMAND}
-		CONFIGURE_COMMAND ""
-		${LUA_JIT_BUILD_COMMAND}
-		INSTALL_COMMAND ""
-		TEST_COMMAND ""
-		BUILD_BYPRODUCTS ${LUA_JIT_BYPRODUCTS})
-endif()
-
-if (NOT LUAJIT_BUILD_LOCAL_DIR)
-	ExternalProject_Add_Step(LUA_JIT move
-		ALWAYS TRUE
-		${LUA_JIT_POSTBUILD_COMMANDS}
-		WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" 
-		COMMENT ${LUA_JIT_POSTBUILD_COMMENTS}
-		DEPENDEES build
-		DEPENDS ${LUA_JIT_BYPRODUCTS}
-		BYPRODUCTS ${LUA_JIT_INSTALL_BYPRODUCTS})
-	ExternalProject_Add_StepTargets(LUA_JIT move)
 endif()
 
 # # Lua Library
diff --git a/cmake/Packages/FindLuaBuild/LuaVanilla.cmake b/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
index 2b30dde..98ceb8f 100644
--- a/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
+++ b/cmake/Packages/FindLuaBuild/LuaVanilla.cmake
@@ -26,8 +26,6 @@ if(_lua_vanilla_build_included)
 endif(_lua_vanilla_build_included)
 set(_lua_vanilla_build_included true)
 
-# import necessary standard modules
-include(ExternalProject)
 # import other modules
 include(Common/Core)
 
@@ -170,36 +168,6 @@ if (LUA_LOCAL_DIR)
 	add_custom_target(LUA_VANILLA
 		DEPENDS "${LUA_VANILLA_LIB_SOURCES}" "${LUA_VANILLA_LUA_SOURCES}")
 	set(LUA_VANILLA_INCLUDE_DIRS ${LUA_VANILLA_INCLUDE_DIRS} "${LUA_VANILLA_SOURCE_DIR}/include")
-else()
-	include(FetchContent)
-	FetchContent_Declare(
-		lua-vanilla
-		URL ${LUA_VANILLA_DOWNLOAD_URL})
-	FetchContent_GetProperties(lua-vanilla)
-	if ( NOT lua-vanilla_POPULATED)
-		# Fetch the content using previously declared details
-		FetchContent_Populate(lua-vanilla)
-		# do not add_subdirectory / build: we are JUST using ti as a download step!
-	endif()
-	list(TRANSFORM LUA_VANILLA_LIB_SOURCES PREPEND "${lua-vanilla_SOURCE_DIR}/src/")
-	list(TRANSFORM LUA_VANILLA_LUA_SOURCES PREPEND "${lua-vanilla_SOURCE_DIR}/src/")
-	# make a quick lua.hpp for targets that don't have it
-	if (LUA_VANILLA_GENERATE_LUA_HPP)
-		set(LUA_VANILLA_LUA_HPP_CONTENT "// lua.hpp
-// Lua header files for C++
-// <<extern \"C\">> not supplied automatically because Lua also compiles as C++
-extern \"C\" {
-#include \"lua.h\"
-#include \"lualib.h\"
-#include \"lauxlib.h\"
-}
-")
-		set(LUA_VANILLA_SOURCE_LUA_HPP "${lua-vanilla_SOURCE_DIR}/include/lua.hpp")
-		file(CONFIGURE OUTPUT "${LUA_VANILLA_SOURCE_LUA_HPP}" CONTENT "${LUA_VANILLA_LUA_HPP_CONTENT}" @ONLY)
-		file(TO_NATIVE_PATH "${LUA_VANILLA_SOURCE_LUA_HPP}" LUA_VANILLA_SOURCE_LUA_HPP)
-	endif()
-
-	set(LUA_VANILLA_INCLUDE_DIRS ${lua-vanilla_SOURCE_DIR}/src)
 endif()
 
 # # Target names
diff --git a/cmake/Packages/FindLuwraBuild.cmake b/cmake/Packages/FindLuwraBuild.cmake
index 28a5a25..8363a1c 100644
--- a/cmake/Packages/FindLuwraBuild.cmake
+++ b/cmake/Packages/FindLuwraBuild.cmake
@@ -20,7 +20,6 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-include(ExternalProject)
 include(FindPackageHandleStandardArgs)
 include(Common/Core)
 
@@ -36,28 +35,7 @@ set(luwra_include_dirs "${luwra_build_toplevel}/lib")
 set(luwra_sources luwra.hpp)
 prepend(luwra_sources "${luwra_build_toplevel}/lib/" ${luwra_sources})
 
-# # External project to get sources
-ExternalProject_Add(LUWRA_BUILD_SOURCE
-	BUILD_IN_SOURCE TRUE
-	BUILD_ALWAYS FALSE
-	# # Use Git to get what we need
-	GIT_SHALLOW TRUE
-	#GIT_TAG e513907fc8c2d59ebd91cd5992eddf54f7e23e21
-	GIT_REPOSITORY https://github.com/vapourismo/luwra.git
-	PREFIX ${luwra_build_toplevel}
-	SOURCE_DIR ${luwra_build_toplevel}
-	DOWNLOAD_DIR ${luwra_build_toplevel}
-	TMP_DIR "${luwra_build_toplevel}-tmp"
-	STAMP_DIR "${luwra_build_toplevel}-stamp"
-	INSTALL_DIR "${luwra_build_toplevel}/local"
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	BUILD_BYPRODUCTS "${luwra_sources}")
-
 add_library(${luwra_lib} INTERFACE)
-add_dependencies(${luwra_lib} LUWRA_BUILD_SOURCE)
 target_include_directories(${luwra_lib} INTERFACE ${luwra_include_dirs})
 target_link_libraries(${luwra_lib} INTERFACE Lua::Lua)
 if (NOT MSVC)
diff --git a/cmake/Packages/FindToLuappBuild.cmake b/cmake/Packages/FindToLuappBuild.cmake
index 652dbc0..e0b2544 100644
--- a/cmake/Packages/FindToLuappBuild.cmake
+++ b/cmake/Packages/FindToLuappBuild.cmake
@@ -21,7 +21,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # # Standard CMake Libraries
-include(ExternalProject)
 include(FindPackageHandleStandardArgs)
 include(Common/Core)
 
@@ -37,29 +36,8 @@ set(toluapp_sources tolua_event.c tolua_event.h tolua_is.c tolua_map.c tolua_pus
 prepend(toluapp_sources "${toluapp_build_toplevel}/src/lib/" ${toluapp_sources})
 list(APPEND toluapp_sources "${toluapp_build_toplevel}/include/tolua++.h")
 
-# # External project to get sources
-ExternalProject_Add(TOLUAPP_BUILD_SOURCE
-	BUILD_IN_SOURCE TRUE
-	BUILD_ALWAYS FALSE
-	# # Use Git to get what we need
-	#GIT_SUBMODULES ""
-	GIT_SHALLOW TRUE
-	GIT_REPOSITORY https://github.com/ThePhD/toluapp
-	PREFIX ${toluapp_build_toplevel}
-	SOURCE_DIR ${toluapp_build_toplevel}
-	DOWNLOAD_DIR ${toluapp_build_toplevel}
-	TMP_DIR "${toluapp_build_toplevel}-tmp"
-	STAMP_DIR "${toluapp_build_toplevel}-stamp"
-	INSTALL_DIR "${toluapp_build_toplevel}/local"
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	BUILD_BYPRODUCTS "${toluapp_sources}")
-
 set(toluapp_lib toluapp_lib_${toluapp_version})
 add_library(${toluapp_lib} SHARED ${toluapp_sources})
-add_dependencies(${toluapp_lib} TOLUAPP_BUILD_SOURCE)
 set_target_properties(${toluapp_lib} PROPERTIES
 	OUTPUT_NAME toluapp-${toluapp_version}
 	POSITION_INDEPENDENT_CODE TRUE)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f8afa6e..80feaaf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,12 +23,7 @@
 # # # # sol2 tests
 
 # # Dependencies
-FetchContent_Declare(
-	Catch2
-	GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-	GIT_TAG devel
-)
-FetchContent_MakeAvailable(Catch2)
+find_package(Catch2)
 
 function(sol2_add_test_properties target-name)
 	target_link_libraries(${target-name}