From 1c5b4de11fb85581501eedd32b26b8dbdbbd4e13 Mon Sep 17 00:00:00 2001 From: KokaKiwi Date: Thu, 3 Mar 2022 19:58:41 +0100 Subject: [PATCH 1/3] makepkg: Remove external stuff --- CMakeLists.txt | 1 - cmake/build_helpers.cmake | 29 ----------------------------- 2 files changed, 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfddb106..ec738564 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,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 diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index c5954466..74e21048 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -225,7 +225,6 @@ macro(createPackage) install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png) install(FILES "$" DESTINATION "${CMAKE_INSTALL_LIBDIR}") - downloadImHexPatternsFiles("./share/imhex") endif() if (CREATE_BUNDLE) @@ -275,31 +274,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 dest) - 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 ${dest}) - endforeach() - -endfunction() \ No newline at end of file -- 2.37.0