fetchcontent stormlib

Author: briaguya-ai

.github/workflows/apt-deps.txt

@@ -1 +1 @@
-libsdl2-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool ninja-build nlohmann-json3-dev libtinyxml2-dev libspdlog-dev
+libsdl2-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool ninja-build nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libstorm-dev

cmake/dependencies/common.cmake

@@ -30,3 +30,15 @@ target_sources(ImGui
 )
 
 target_include_directories(ImGui PUBLIC ${imgui_SOURCE_DIR} ${imgui_SOURCE_DIR}/backends PRIVATE ${SDL2_INCLUDE_DIRS})
+
+# ========= StormLib =============
+if(TRUE)
+    FetchContent_Declare(
+        StormLib
+        GIT_REPOSITORY https://github.com/ladislav-zezula/StormLib.git
+        GIT_TAG v9.25
+        OVERRIDE_FIND_PACKAGE
+    )
+    FetchContent_MakeAvailable(StormLib)
+    list(APPEND ADDITIONAL_LIB_INCLUDES ${stormlib_SOURCE_DIR}/src)
+endif()

extern/CMakeLists.txt

@@ -5,19 +5,6 @@ add_library(DrLibs INTERFACE)
 
 target_include_directories(DrLibs INTERFACE ${DRLIBS_DIR})
 
-#=================== Storm ===================
-
-set(STORMLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/StormLib)
-add_subdirectory(${STORMLIB_DIR})
-if((CMAKE_SYSTEM_NAME MATCHES "Windows") AND ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
-    include(../cmake/HandleCompilerRT.cmake)
-    find_compiler_rt_library(builtins CLANG_RT_BUILTINS_LIBRARY)
-    get_filename_component(LIBDIR "${CLANG_RT_BUILTINS_LIBRARY}" DIRECTORY)
-    if(IS_DIRECTORY "${LIBDIR}")
-        target_link_libraries(storm ${CLANG_RT_BUILTINS_LIBRARY})
-    endif()
-endif()
-
 #=================== ZAPDUtils ===================
 
 set(ZAPDUTILS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ZAPDUtils)