build: move third party libraries to lib/third_party (#1417)

Co-authored-by: Nik <werwolv98@gmail.com>

.gitmodules

@@ -1,25 +1,25 @@
 [submodule "lib/external/nativefiledialog"]
-	path = lib/external/nativefiledialog
+	path = lib/third_party/nativefiledialog
 	url = https://github.com/btzy/nativefiledialog-extended
 	ignore = dirty
 [submodule "lib/external/yara/yara"]
-	path = lib/external/yara/yara
+	path = lib/third_party/yara/yara
 	url = https://github.com/VirusTotal/yara
 	ignore = dirty
 [submodule "lib/external/xdgpp"]
-	path = lib/external/xdgpp
+	path = lib/third_party/xdgpp
 	url = https://git.sr.ht/~danyspin97/xdgpp
 	ignore = dirty
 [submodule "lib/external/fmt"]
-	path = lib/external/fmt
+	path = lib/third_party/fmt
 	url = https://github.com/fmtlib/fmt
 	ignore = dirty
 [submodule "lib/external/capstone"]
-	path = lib/external/capstone
+	path = lib/third_party/capstone
 	url = https://github.com/capstone-engine/capstone
 	ignore = dirty
 [submodule "lib/external/jthread/jthread"]
-    path = lib/external/jthread/jthread
+	path = lib/third_party/jthread/jthread
     url = https://github.com/josuttis/jthread
     ignore = dirty
 

cmake/build_helpers.cmake

@@ -373,7 +373,7 @@ function(detectBadClone)
         return()
     endif()
 
-    file (GLOB EXTERNAL_DIRS "lib/external/*")
+    file (GLOB EXTERNAL_DIRS "lib/external/*" "lib/third_party/*")
     foreach (EXTERNAL_DIR ${EXTERNAL_DIRS})
         file(GLOB_RECURSE RESULT "${EXTERNAL_DIR}/*")
         list(LENGTH RESULT ENTRY_COUNT)
@@ -477,16 +477,17 @@ endmacro()
 macro(addBundledLibraries)
     find_package(PkgConfig REQUIRED)
 
-    set(EXTERN_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external")
+    set(EXTERNAL_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external")
+    set(THIRD_PARTY_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/third_party")
 
     set(BUILD_SHARED_LIBS OFF)
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/imgui)
+    add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/imgui)
     set_target_properties(imgui PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/microtar EXCLUDE_FROM_ALL)
+    add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/microtar EXCLUDE_FROM_ALL)
     set_target_properties(microtar PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/libwolv EXCLUDE_FROM_ALL)
+    add_subdirectory(${EXTERNAL_LIBS_FOLDER}/libwolv EXCLUDE_FROM_ALL)
     set_property(TARGET libwolv-types PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-utils PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-io PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -494,13 +495,13 @@ macro(addBundledLibraries)
     set_property(TARGET libwolv-containers PROPERTY POSITION_INDEPENDENT_CODE ON)
     set_property(TARGET libwolv-net PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-    set(XDGPP_INCLUDE_DIRS "${EXTERN_LIBS_FOLDER}/xdgpp")
+    set(XDGPP_INCLUDE_DIRS "${THIRD_PARTY_LIBS_FOLDER}/xdgpp")
     set(FPHSA_NAME_MISMATCHED ON CACHE BOOL "")
 
     find_package(PkgConfig REQUIRED)
 
     if(NOT USE_SYSTEM_FMT)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/fmt EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/fmt EXCLUDE_FROM_ALL)
         set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(FMT_LIBRARIES fmt::fmt-header-only)
     else()
@@ -521,7 +522,7 @@ macro(addBundledLibraries)
 
         # nfd
         if (NOT USE_SYSTEM_NFD)
-            add_subdirectory(${EXTERN_LIBS_FOLDER}/nativefiledialog EXCLUDE_FROM_ALL)
+            add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/nativefiledialog EXCLUDE_FROM_ALL)
             set_target_properties(nfd PROPERTIES POSITION_INDEPENDENT_CODE ON)
             set(NFD_LIBRARIES nfd)
         else()
@@ -531,7 +532,7 @@ macro(addBundledLibraries)
     endif()
 
     if(NOT USE_SYSTEM_NLOHMANN_JSON)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/nlohmann_json EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/nlohmann_json EXCLUDE_FROM_ALL)
         set(NLOHMANN_JSON_LIBRARIES nlohmann_json)
     else()
         find_package(nlohmann_json 3.10.2 REQUIRED)
@@ -539,14 +540,14 @@ macro(addBundledLibraries)
     endif()
 
     if (NOT USE_SYSTEM_LLVM)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
         set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
     else()
         find_package(LLVM REQUIRED Demangle)
     endif()
 
     if (NOT USE_SYSTEM_YARA)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/yara EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/yara EXCLUDE_FROM_ALL)
         set_target_properties(libyara PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(YARA_LIBRARIES libyara)
     else()
@@ -555,7 +556,7 @@ macro(addBundledLibraries)
     endif()
 
     if (NOT USE_SYSTEM_MINIAUDIO)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/miniaudio EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/miniaudio EXCLUDE_FROM_ALL)
         set_target_properties(miniaudio PROPERTIES POSITION_INDEPENDENT_CODE ON)
         set(MINIAUDIO_LIBRARIES miniaudio)
     else()
@@ -564,7 +565,7 @@ macro(addBundledLibraries)
     endif()
 
     if (NOT USE_SYSTEM_JTHREAD)
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/jthread EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/jthread EXCLUDE_FROM_ALL)
         set(JTHREAD_LIBRARIES jthread)
     else()
         find_path(JOSUTTIS_JTHREAD_INCLUDE_DIRS "condition_variable_any2.hpp")
@@ -579,18 +580,18 @@ macro(addBundledLibraries)
         set(CAPSTONE_BUILD_STATIC_RUNTIME OFF CACHE BOOL "Disable shared library building")
         set(CAPSTONE_BUILD_SHARED OFF CACHE BOOL "Disable shared library building")
         set(CAPSTONE_BUILD_TESTS OFF CACHE BOOL "Disable tests")
-        add_subdirectory(${EXTERN_LIBS_FOLDER}/capstone EXCLUDE_FROM_ALL)
+        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/capstone EXCLUDE_FROM_ALL)
         set_target_properties(capstone PROPERTIES POSITION_INDEPENDENT_CODE ON)
         target_compile_options(capstone PRIVATE -Wno-unused-function)
         set(CAPSTONE_LIBRARIES "capstone")
-        set(CAPSTONE_INCLUDE_DIRS ${EXTERN_LIBS_FOLDER}/capstone/include)
+        set(CAPSTONE_INCLUDE_DIRS ${THIRD_PARTY_LIBS_FOLDER}/capstone/include)
     else()
         find_package(PkgConfig REQUIRED)
         pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone)
     endif()
 
     set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF)
-    add_subdirectory(${EXTERN_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
+    add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
     set_target_properties(libpl PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
     find_package(mbedTLS 3.4.0 REQUIRED)

dist/rpm/imhex.spec

@@ -61,7 +61,7 @@ same time ImHex is completely free and open source under the GPLv2 language.
 %prep
 %autosetup -n ImHex
 # remove bundled libs we aren't using
-rm -rf lib/external/{curl,fmt,llvm,nlohmann_json,yara}
+rm -rf lib/third_party/{fmt,nlohmann_json,yara}
 
 %build
 %if 0%{?rhel}
@@ -109,11 +109,11 @@ rm -f %{buildroot}%{_metainfodir}/net.werwolv.%{name}.appdata.xml
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.werwolv.%{name}.metainfo.xml
 
 # install licenses
-cp -a lib/external/nativefiledialog/LICENSE                       %{buildroot}%{_datadir}/licenses/%{name}/nativefiledialog-LICENSE
-cp -a lib/external/capstone/LICENSE.TXT                           %{buildroot}%{_datadir}/licenses/%{name}/capstone-LICENSE
-cp -a lib/external/capstone/suite/regress/LICENSE                 %{buildroot}%{_datadir}/licenses/%{name}/capstone-regress-LICENSE
-cp -a lib/external/microtar/LICENSE                               %{buildroot}%{_datadir}/licenses/%{name}/microtar-LICENSE
-cp -a lib/external/xdgpp/LICENSE                                  %{buildroot}%{_datadir}/licenses/%{name}/xdgpp-LICENSE
+cp -a lib/third_party/nativefiledialog/LICENSE                       %{buildroot}%{_datadir}/licenses/%{name}/nativefiledialog-LICENSE
+cp -a lib/third_party/capstone/LICENSE.TXT                           %{buildroot}%{_datadir}/licenses/%{name}/capstone-LICENSE
+cp -a lib/third_party/capstone/suite/regress/LICENSE                 %{buildroot}%{_datadir}/licenses/%{name}/capstone-regress-LICENSE
+cp -a lib/third_party/microtar/LICENSE                               %{buildroot}%{_datadir}/licenses/%{name}/microtar-LICENSE
+cp -a lib/third_party/xdgpp/LICENSE                                  %{buildroot}%{_datadir}/licenses/%{name}/xdgpp-LICENSE
 
 
 %files