GiteaCI (#3)

Reviewed-on: #3
Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>
Co-committed-by: Romain BOULLARD <romain.boullard@protonmail.com>

CMake/FindDependencies.cmake

@@ -8,20 +8,18 @@ endif()
 find_package(EASTL REQUIRED)
 find_package(unordered_dense REQUIRED)
 find_package(mimalloc REQUIRED)
-find_package(magic_enum REQUIRED)
 find_package(stduuid REQUIRED)
 find_package(SQLite3 REQUIRED)
 find_package(CLI11 REQUIRED)
-find_package(xxHash REQUIRED)
+find_package(rapidhash REQUIRED)
 find_package(effolkronium_random REQUIRED)
-find_package(zeus_expected REQUIRED)
 find_package(flatbuffers CONFIG REQUIRED)
 
 if(TRACY)
     find_package(Tracy REQUIRED)
 endif()
 
-if(${is_multi_config})
+if(${IS_MULTI_CONFIG})
     find_package(quill REQUIRED)
     find_package(cpptrace REQUIRED)
 elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
@@ -36,7 +34,7 @@ find_package(imgui REQUIRED)
 
 if(VULKAN)
     find_package(VulkanHeaders REQUIRED)
-    if(${is_multi_config})
+    if(${IS_MULTI_CONFIG})
         find_package(vulkan-validationlayers REQUIRED)
     elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
         find_package(vulkan-validationlayers REQUIRED)

CMake/Package.cmake

@@ -1,9 +1,11 @@
-function(bigfoot_create_package_lib PackageName PackagePublicDependencies PackagePrivateDependencies PackageBigfootPublicDependencies PackageBigfootPrivateDependencies ParentFolder)
-    project(${PackageName})
-    
+function(bigfoot_create_package_lib PackagePublicDependencies PackagePrivateDependencies PackageBigfootPublicDependencies PackageBigfootPrivateDependencies ParentFolder)
     add_library(${PROJECT_NAME} STATIC)
     set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 
+    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Include)
+
+    bigfoot_compile_flatbuffers("${PackageBigfootPublicDependencies}")
+
     # collect sources (reconfigure when files are added/removed)
     file(GLOB_RECURSE _BF_SOURCES
          CONFIGURE_DEPENDS
@@ -20,33 +22,25 @@ function(bigfoot_create_package_lib PackageName PackagePublicDependencies Packag
             ${_BF_SOURCES}
     )
 
-    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Include)
+    target_link_libraries(${PROJECT_NAME} PUBLIC unordered_dense::unordered_dense EASTL::EASTL flatbuffers::flatbuffers rapidhash::rapidhash)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_DL_LIBS})
 
     target_link_libraries(${PROJECT_NAME} PUBLIC ${PackagePublicDependencies})
     target_link_libraries(${PROJECT_NAME} PRIVATE ${PackagePrivateDependencies})
-    target_link_libraries(${PROJECT_NAME} PUBLIC "$<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPublicDependencies}>")
-    target_link_libraries(${PROJECT_NAME} PRIVATE "$<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPrivateDependencies}>")
-    target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_DL_LIBS})
-
-    target_link_options(${PROJECT_NAME} PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/INCREMENTAL:NO>)
-
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX /D_HAS_EXCEPTIONS=0 /GR- /Zc:__cplusplus /fp:fast>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -fno-exceptions -fno-rtti -ffast-math -fno-strict-aliasing>)
+    target_link_libraries(${PROJECT_NAME} PUBLIC $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPublicDependencies}>)
+    target_link_libraries(${PROJECT_NAME} PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPrivateDependencies}>)
 
     source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${_BF_SOURCES})
 
     set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Bigfoot/${ParentFolder})
-    set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ${UNITY_BUILD})
 endfunction()
 
-function(bigfoot_create_package_tests PackageName ParentFolder)
-    project(${PackageName}Tests)
-
+function(bigfoot_create_package_tests ParentFolder BigfootDependencies)
     add_executable(${PROJECT_NAME})
     set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 
+    bigfoot_compile_flatbuffers("${BigfootDependencies}")
+
     file(GLOB_RECURSE _BF_TEST_SOURCES
          CONFIGURE_DEPENDS
          ${CMAKE_CURRENT_SOURCE_DIR}/*.h
@@ -63,23 +57,37 @@ function(bigfoot_create_package_tests PackageName ParentFolder)
 
     target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Include)
 
-    target_link_libraries(${PROJECT_NAME} PRIVATE "$<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageName}>")
+    target_link_libraries(${PROJECT_NAME} PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageName}>)
     target_link_libraries(${PROJECT_NAME} PRIVATE gtest::gtest)
 
-    target_link_options(${PROJECT_NAME} PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/INCREMENTAL:NO>)
-
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX /D_HAS_EXCEPTIONS=0 /GR- /Zc:__cplusplus /fp:fast>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -fno-exceptions -fno-rtti -ffast-math -fno-strict-aliasing>)
-
     include(GoogleTest)
     gtest_discover_tests(${PROJECT_NAME} XML_OUTPUT_DIR ${CMAKE_BINARY_DIR}/TestResults/)
 
     source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src/ FILES ${_BF_TEST_SOURCES})
 
     set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Tests/Bigfoot/${ParentFolder})
-    set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ${UNITY_BUILD})
 
-    bigfoot_setup_dependencies(${PROJECT_NAME} "Tests/Bigfoot")
+    ##################COPY FIXTURE FOLDER###################
+
+    if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Fixture)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Fixture)
+    endif()
+
+    # Track all fixture files
+    file(GLOB_RECURSE FIXTURE_FILES
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/Fixture/*
+    )
+
+    add_custom_target(${PROJECT_NAME}Fixture
+            COMMAND ${CMAKE_COMMAND} -E remove_directory $<TARGET_FILE_DIR:${PROJECT_NAME}>/Fixture
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Fixture $<TARGET_FILE_DIR:${PROJECT_NAME}>/Fixture
+            DEPENDS ${FIXTURE_FILES}
+            COMMENT "Copying Fixture folder for ${PROJECT_NAME}"
+    )
+
+    add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}Fixture)
+
+    set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/Tests/Bigfoot/${ParentFolder})
+
 endfunction()

CMake/Utils.cmake

@@ -1,14 +1,14 @@
-function(bigfoot_create_logger PackageName)
-    set(LOGGER_FILENAME ${PackageName}Logger)
-    string(TOUPPER ${PackageName}_Logger LOGGER_NAME)
+function(bigfoot_create_logger)
+    set(LOGGER_FILENAME ${PROJECT_NAME}Logger)
+    string(TOUPPER ${PROJECT_NAME}_Logger LOGGER_NAME)
     string(TOUPPER ${LOGGER_FILENAME} LOGGER_FILENAME_UPPER)
-    configure_file( ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Utils/Include/Utils/TargetLogger.generated.hpp.in
-                    ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PackageName}/${LOGGER_FILENAME}.generated.hpp
+    configure_file( ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/System/Include/System/Log/TargetLogger_generated.hpp.in
+                    ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PROJECT_NAME}/${LOGGER_FILENAME}_generated.hpp
                     @ONLY)
 endfunction()
 
-function(bigfoot_create_bigfile PackageName ParentFolder)
-    set(OUTPUT_PATH_BIGFILE "${CMAKE_CURRENT_BINARY_DIR}/${PackageName}-bigfile.db")
+function(bigfoot_create_bigfile ParentFolder)
+    set(OUTPUT_PATH_BIGFILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}-bigfile.db")
     get_filename_component(OUTPUT_PATH_BIGFILE_ABSOLUTE ${OUTPUT_PATH_BIGFILE} ABSOLUTE)
     get_filename_component(OUTPUT_PATH_BIGFILE_DIRECTORY ${OUTPUT_PATH_BIGFILE_ABSOLUTE} DIRECTORY)
 
@@ -16,125 +16,130 @@ function(bigfoot_create_bigfile PackageName ParentFolder)
         OUTPUT ${OUTPUT_PATH_BIGFILE_ABSOLUTE}.bftimestamp ${OUTPUT_PATH_BIGFILE_ABSOLUTE}
         DEPENDS ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql
         COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTPUT_PATH_BIGFILE_DIRECTORY}
-        COMMAND sqlite3 ${OUTPUT_PATH_BIGFILE_ABSOLUTE} < ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql
+        COMMAND ${SQLITE3_EXECUTABLE} ${OUTPUT_PATH_BIGFILE_ABSOLUTE} < ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql
         COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT_PATH_BIGFILE_ABSOLUTE}.bftimestamp
         COMMENT "Creating Bigfile ${OUTPUT_PATH_BIGFILE_ABSOLUTE}"
     )
     list(APPEND BIGFILE_SOURCES ${OUTPUT_PATH_BIGFILE_ABSOLUTE}.bftimestamp)
 
-    add_custom_target(${PackageName}BigFile ALL DEPENDS ${BIGFILE_SOURCES})
-    set_target_properties(${PackageName}BigFile PROPERTIES FOLDER UtilityTargets/${ParentFolder})
+    add_custom_target(${PROJECT_NAME}BigFile ALL DEPENDS ${BIGFILE_SOURCES})
+    set_target_properties(${PROJECT_NAME}BigFile PROPERTIES FOLDER UtilityTargets/${ParentFolder})
+    add_dependencies(${PROJECT_NAME}BigFile ${PROJECT_NAME})
     
-    target_sources(${PackageName}BigFile PRIVATE ${BIGFILE_SOURCES})
+    target_sources(${PROJECT_NAME}BigFile PRIVATE ${BIGFILE_SOURCES})
 
-    string(TOUPPER ${PackageName} BIGFILE_NAME)
-    set(BIGFILE_LOCATION ${OUTPUT_PATH_BIGFILE_ABSOLUTE})
-    configure_file( ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFileInfo.generated.hpp.in
-                    ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PackageName}/BigFileInfo.generated.hpp
+    string(TOUPPER ${PROJECT_NAME} BIGFILE_NAME)
+    set(BIGFILE_LOCATION "./${PROJECT_NAME}-bigfile.db")
+    configure_file( ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in
+                    ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PROJECT_NAME}/BigFileInfo_generated.hpp
                     @ONLY)
 endfunction()
 
-function(bigfoot_compile_flatbuffers Source IncludeFolders)
-    file(GLOB_RECURSE SOURCES ${Source}/*.fbs)
+function(bigfoot_compile_flatbuffers BigfootDependencies)
+    set(IncludeFolders "")
 
-    foreach(SOURCE_FILE ${SOURCES})
+    get_target_property(CurrentTargetDependencyInclude ${PROJECT_NAME} INCLUDE_DIRECTORIES)
+    if(CurrentTargetDependencyInclude)
+        list(APPEND IncludeFolders ${CurrentTargetDependencyInclude})
+    endif()
+    
+    foreach(Dependency IN LISTS BigfootDependencies)
+        get_target_property(DependencyInclude ${Dependency} INCLUDE_DIRECTORIES)
+        if(DependencyInclude)
+            list(APPEND IncludeFolders ${DependencyInclude})
+        endif()
+    endforeach()
+
+    set(IncludeFlags "")
+    foreach(folder IN LISTS IncludeFolders)
+        list(APPEND IncludeFlags -I "${folder}")
+    endforeach()
+
+    file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Include/*.fbs")
+    foreach(SOURCE_FILE IN LISTS SOURCES)
         get_filename_component(SOURCE_DIRECTORY ${SOURCE_FILE} DIRECTORY)
 
         set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${SOURCE_FILE})
 
         execute_process(
             COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE}
-            --cpp
-            -I ${IncludeFolders}
-            --keep-prefix
-            --scoped-enums
-            --gen-name-strings
-            --gen-object-api
-            --gen-compare
-            --force-empty
-            --no-cpp-direct-copy
-            --cpp-str-flex-ctor
-            --cpp-std c++17
-            --reflect-names
-            -o "${SOURCE_DIRECTORY}"
-            "${SOURCE_FILE}"
+                    --cpp
+                    ${IncludeFlags}
+                    --keep-prefix
+                    --filename-ext "hpp"
+                    --reflect-types
+                    --cpp-std c++17
+                    --reflect-names
+                    --gen-name-strings
+                    --gen-object-api
+                    --cpp-str-flex-ctor
+                    --no-cpp-direct-copy
+                    --force-empty
+                    --cpp-ptr-type "eastl::unique_ptr"
+                    --cpp-str-type "eastl::string"
+                    --cpp-include "EASTL/unique_ptr.h"
+                    --cpp-include "EASTL/string.h"
+                    -o "${SOURCE_DIRECTORY}"
+                    "${SOURCE_FILE}" 
         )
     endforeach()
 endfunction()
 
-function(bigfoot_setup_dependencies Target ParentFolder)
+function(bigfoot_setup_dependencies ParentFolder)
     set(CONAN_DEPLOYER_DIR "${CMAKE_SOURCE_DIR}/build/full_deploy/host")
 
     if(EXISTS ${CONAN_DEPLOYER_DIR})
         if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-            file(GLOB_RECURSE all_binaries ${CONAN_DEPLOYER_DIR}/*mimalloc*.dll)
+            file(GLOB_RECURSE SHARED_BINARIES ${CONAN_DEPLOYER_DIR}/*mimalloc*.dll)
         elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-            file(GLOB_RECURSE all_binaries ${CONAN_DEPLOYER_DIR}/*mimalloc*.so*)
+            file(GLOB_RECURSE SHARED_BINARIES ${CONAN_DEPLOYER_DIR}/*mimalloc*.so*)
         endif()
 
-        if(NOT all_binaries STREQUAL "")
-            if(${is_multi_config})
-                foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES})   
-                    if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-                        foreach(file ${all_binaries})
-                            if(file MATCHES "/${CONFIG}/")
-                                list(APPEND shared_binaries_${CONFIG} ${file})
-                            endif()
-                        endforeach()
-                    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-                        foreach(file ${all_binaries})
-                            if(file MATCHES "/${CONFIG}/")
-                                list(APPEND shared_binaries_${CONFIG} ${file})
-                            endif()
-                        endforeach()
+        if(${IS_MULTI_CONFIG})
+            foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES})   
+                foreach(file ${SHARED_BINARIES})
+                    if(file MATCHES "/${CONFIG}/")
+                        list(APPEND SHARED_BINARIES_${CONFIG} ${file})
                     endif()
                 endforeach()
+            endforeach()
 
-                add_custom_target(${Target}CopySharedBinaries
-                        ALL DEPENDS all_binaries
-                        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${Target}>
-                        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_if_different,true> ${shared_binaries_Debug} $<TARGET_FILE_DIR:${Target}>
-                        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Release>,copy_if_different,true> ${shared_binaries_Release} $<TARGET_FILE_DIR:${Target}>
-                        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:RelWithDebInfo>,copy_if_different,true> ${shared_binaries_RelWithDebInfo} $<TARGET_FILE_DIR:${Target}>
-                        COMMENT "Copy shared binaries"
-                )
-                add_dependencies(${Target} ${Target}CopySharedBinaries)
-                set_target_properties(${Target}CopySharedBinaries PROPERTIES FOLDER UtilityTargets/${ParentFolder})
+            add_custom_target(${PROJECT_NAME}CopySharedBinaries
+                    ALL DEPENDS SHARED_BINARIES
+                    COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                    COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_if_different,true> ${SHARED_BINARIES_Debug} $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                    COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Release>,copy_if_different,true> ${SHARED_BINARIES_Release} $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                    COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:RelWithDebInfo>,copy_if_different,true> ${SHARED_BINARIES_RelWithDebInfo} $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                    COMMENT "Copy shared binaries for ${PROJECT_NAME}"
+            )
+            add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}CopySharedBinaries)
+            set_target_properties(${PROJECT_NAME}CopySharedBinaries PROPERTIES FOLDER UtilityTargets/${ParentFolder})
 
-            else()
-                if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-                    foreach(file ${all_binaries})
-                        if(file MATCHES "/${CMAKE_BUILD_TYPE}/")
-                            list(APPEND shared_binaries_${CMAKE_BUILD_TYPE} ${file})
-                        endif()
-                    endforeach()
-                elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-                    foreach(file ${all_binaries})
-                        if(file MATCHES "/${CMAKE_BUILD_TYPE}/")
-                            list(APPEND shared_binaries_${CMAKE_BUILD_TYPE} ${file})
-                        endif()
-                    endforeach()
+        else()
+            foreach(file ${SHARED_BINARIES})
+                if(file MATCHES "/${CMAKE_BUILD_TYPE}/")
+                    list(APPEND SHARED_BINARIES_${CMAKE_BUILD_TYPE} ${file})
                 endif()
+            endforeach()
 
-                add_custom_target(${Target}CopySharedBinaries ALL
-                        DEPENDS ${shared_binaries_${CMAKE_BUILD_TYPE}}
-                        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${Target}>
-                        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${shared_binaries_${CMAKE_BUILD_TYPE}} $<TARGET_FILE_DIR:${Target}>
-                        COMMENT "Copy shared binaries"
-                )
-                add_dependencies(${Target} ${Target}CopySharedBinaries)
-                set_target_properties(${Target}CopySharedBinaries PROPERTIES FOLDER UtilityTargets/${ParentFolder})
-            endif()
+            add_custom_target(${PROJECT_NAME}CopySharedBinaries ALL
+                    DEPENDS ${SHARED_BINARIES_${CMAKE_BUILD_TYPE}}
+                    COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SHARED_BINARIES_${CMAKE_BUILD_TYPE}} $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                    COMMENT "Copy shared binaries for ${PROJECT_NAME}"
+            )
+            add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}CopySharedBinaries)
+            set_target_properties(${PROJECT_NAME}CopySharedBinaries PROPERTIES FOLDER UtilityTargets/${ParentFolder})
         endif()
     endif()
 
     if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        add_custom_command(
-                TARGET ${Target}
-                POST_BUILD
-                COMMAND ${CMAKE_SOURCE_DIR}/Vendor/Tools/Mimalloc2.2.4/minject.exe -i -f $<TARGET_FILE:${Target}>
-                COMMENT "Patching ${Target} to ensure mimalloc dynamic override"
+        add_custom_target(${PROJECT_NAME}PatchMinject ALL
+            COMMAND ${MINJECT_EXECUTABLE} -i -f $<TARGET_FILE:${PROJECT_NAME}>
+            COMMENT "Patching ${PROJECT_NAME} to ensure mimalloc dynamic override"
         )
+        add_dependencies(${PROJECT_NAME}PatchMinject ${PROJECT_NAME})
+        set_target_properties(${PROJECT_NAME}PatchMinject PROPERTIES FOLDER "UtilityTargets/${ParentFolder}")
     endif()
 
 endfunction()