blob: 1fce97f531947ba6d6559fe0cc19bb42f4ff37c7 (
plain)
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
|
From 8fb358f96beee2b8767c9c54a214bf1ee8f77471 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Thu, 3 Mar 2022 19:58:41 +0100
Subject: [PATCH 1/2] makepkg: Remove external stuff
---
CMakeLists.txt | 4 ----
cmake/build_helpers.cmake | 28 ----------------------------
2 files changed, 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ba7b859..7d58d310 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
# Make sure project is configured correctly
setDefaultBuiltTypeIfUnset()
-detectBadClone()
# List plugin names here. Project name must match folder name
set(PLUGINS
@@ -36,6 +35,3 @@ add_subdirectory(tests EXCLUDE_FROM_ALL)
# Configure packaging
createPackage()
-
-# Download and install all current files from the ImHex-Patterns repo
-downloadImHexPatternsFiles()
\ No newline at end of file
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index 8fda5791..873525fb 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -270,31 +270,3 @@ macro(setDefaultBuiltTypeIfUnset)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
endif()
endmacro()
-
-macro(detectBadClone)
- file (GLOB EXTERNAL_DIRS "lib/external/*")
- foreach (EXTERNAL_DIR ${EXTERNAL_DIRS})
- file(GLOB RESULT "${EXTERNAL_DIR}/*")
- list(LENGTH RESULT ENTRY_COUNT)
- if(ENTRY_COUNT LESS_EQUAL 1)
- message(FATAL_ERROR "External dependency ${EXTERNAL_DIR} is empty!\nMake sure to correctly clone ImHex using the --recurse-submodules git option or initialize the submodules manually.")
- endif()
- endforeach ()
-endmacro()
-
-
-function(downloadImHexPatternsFiles)
- FetchContent_Declare(
- imhex_patterns
- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
- GIT_TAG master
- )
-
- FetchContent_Populate(imhex_patterns)
-
- set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
- foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION "./")
- endforeach()
-
-endfunction()
\ No newline at end of file
--
2.35.3
|