Bin2CPP

2026-03-29 03:03:13 +02:00
parent ab96945192
commit 9c59bd6ab8
29 changed files with 782 additions and 179 deletions
--- a/CMake/CustomTargets.cmake
+++ b/CMake/CustomTargets.cmake
@@ -0,0 +1,32 @@
+foreach(CONFIG DEBUG RELWITHDEBINFO)
+    if("${CMAKE_EXE_LINKER_FLAGS_${CONFIG}}" MATCHES "/INCREMENTAL:NO")
+        string(REGEX REPLACE "/INCREMENTAL([^:]|$)" ""
+                CMAKE_EXE_LINKER_FLAGS_${CONFIG}
+                "${CMAKE_EXE_LINKER_FLAGS_${CONFIG}}")
+    endif()
+    if("${CMAKE_SHARED_LINKER_FLAGS_${CONFIG}}" MATCHES "/INCREMENTAL:NO")
+        string(REGEX REPLACE "/INCREMENTAL([^:]|$)" ""
+                CMAKE_SHARED_LINKER_FLAGS_${CONFIG}
+                "${CMAKE_SHARED_LINKER_FLAGS_${CONFIG}}")
+    endif()
+endforeach()
+
+add_library(BigfootCompileAndLinkFlags INTERFACE)
+
+target_compile_options(BigfootCompileAndLinkFlags INTERFACE
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+        $<$<CXX_COMPILER_ID:Clang,GNU>:-Wall -Wextra -Wpedantic -Werror>
+        $<$<AND:$<BOOL:${COVERAGE}>,$<CXX_COMPILER_ID:Clang>>:-fprofile-instr-generate -fcoverage-mapping>
+)
+
+target_link_options(BigfootCompileAndLinkFlags INTERFACE
+        $<$<AND:$<BOOL:${COVERAGE}>,$<CXX_COMPILER_ID:Clang>>:-fprofile-instr-generate>
+)
+
+target_compile_definitions(BigfootCompileAndLinkFlags INTERFACE
+    $<$<PLATFORM_ID:Windows>:NOMINMAX>
+    $<$<PLATFORM_ID:Windows>:WIN32_LEAN_AND_MEAN>
+    $<$<PLATFORM_ID:Windows>:BIGFOOT_WINDOWS>
+    $<$<PLATFORM_ID:Linux>:BIGFOOT_LINUX>
+    $<$<CONFIG:Release>:BIGFOOT_OPTIMIZED>
+    $<$<CONFIG:Debug,RelWithDebInfo>:BIGFOOT_NOT_OPTIMIZED>)
--- a/CMake/FindDependencies.cmake
+++ b/CMake/FindDependencies.cmake
@@ -7,7 +7,11 @@ endif()

 find_package(EASTL REQUIRED)
 find_package(unordered_dense REQUIRED)
-find_package(mimalloc REQUIRED)
+if(${ASAN})
+    find_package(mimalloc-asan REQUIRED)
+else()
+    find_package(mimalloc REQUIRED)
+endif()
 find_package(stduuid REQUIRED)
 find_package(SQLite3 REQUIRED)
 find_package(CLI11 REQUIRED)
--- a/CMake/Package.cmake
+++ b/CMake/Package.cmake
@@ -1,74 +1,110 @@
 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)
+    target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)

    bigfoot_compile_flatbuffers("${PackageBigfootPublicDependencies}")

-    # collect sources (reconfigure when files are added/removed)
-    file(GLOB_RECURSE _BF_SOURCES
-         CONFIGURE_DEPENDS
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.h
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp.in
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.fbs
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.sql
+    file(GLOB_RECURSE _SOURCES
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+    )
+
+    file(GLOB_RECURSE _HEADERS
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.h
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
+    )
+
+    file(GLOB_RECURSE _OTHERS
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp.in
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.fbs
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.sql
    )

    target_sources(${PROJECT_NAME}
        PRIVATE
-            ${_BF_SOURCES}
+            ${_SOURCES}
+            ${_OTHERS}
+        PUBLIC
+            FILE_SET HEADERS
+            BASE_DIRS
+                ${CMAKE_CURRENT_SOURCE_DIR}/Include
+            FILES
+                ${_HEADERS}
    )

-    target_compile_options(${PROJECT_NAME} PRIVATE ${BIGFOOT_CXX_FLAGS})
+    target_link_libraries(${PROJECT_NAME}
+        PRIVATE
+            BigfootCompileAndLinkFlags
+        PUBLIC
+            unordered_dense::unordered_dense
+            EASTL::EASTL
+            flatbuffers::flatbuffers
+            rapidhash::rapidhash
+            
+            ${PackagePublicDependencies}
+            $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPublicDependencies}>

-    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})
+        PRIVATE
+            ${PackagePrivateDependencies}
+            $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPrivateDependencies}>)

-    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}>)
-
-    source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${_BF_SOURCES})
+    source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${_SOURCES} ${_HEADERS} ${_OTHERS})

    set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Bigfoot/${ParentFolder})
 endfunction()

 function(bigfoot_create_package_tests ParentFolder BigfootDependencies)
    add_executable(${PROJECT_NAME})
-    set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)

-    target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Include)
+    target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)

    bigfoot_compile_flatbuffers("${BigfootDependencies}")

-    file(GLOB_RECURSE _BF_TEST_SOURCES
-         CONFIGURE_DEPENDS
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.h
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp.in
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
-         ${CMAKE_CURRENT_SOURCE_DIR}/*.fbs
+    file(GLOB_RECURSE _SOURCES
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+    )
+
+    file(GLOB_RECURSE _HEADERS
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.h
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
+    )
+
+    file(GLOB_RECURSE _OTHERS
+            CONFIGURE_DEPENDS
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp.in
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.fbs
+            ${CMAKE_CURRENT_SOURCE_DIR}/*.sql
    )

    target_sources(${PROJECT_NAME}
        PRIVATE
-            ${_BF_TEST_SOURCES}
+            ${_SOURCES}
+            ${_OTHERS}
+        PUBLIC
+            FILE_SET HEADERS
+            BASE_DIRS
+                ${CMAKE_CURRENT_SOURCE_DIR}/Include
+            FILES
+                ${_HEADERS}
    )

-    target_compile_options(${PROJECT_NAME} PRIVATE ${BIGFOOT_CXX_FLAGS})
-    target_link_options(${PROJECT_NAME} PRIVATE ${BIGFOOT_EXE_LINK_FLAGS})
+    target_link_libraries(${PROJECT_NAME}
+        PRIVATE
+            BigfootCompileAndLinkFlags

-    target_link_libraries(${PROJECT_NAME} PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageName}>)
-    target_link_libraries(${PROJECT_NAME} PRIVATE gtest::gtest)
+        PRIVATE
+            $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageName}>
+            gtest::gtest)

    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})
+    source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src/ FILES ${_SOURCES} ${_HEADERS} ${_OTHERS})

    set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Tests/Bigfoot/${ParentFolder})

--- a/CMake/Utils.cmake
+++ b/CMake/Utils.cmake
@@ -38,15 +38,22 @@ endfunction()
 function(bigfoot_compile_flatbuffers BigfootDependencies)
    set(IncludeFolders "")

-    get_target_property(CurrentTargetDependencyInclude ${PROJECT_NAME} INCLUDE_DIRECTORIES)
-    if(CurrentTargetDependencyInclude)
-        list(APPEND IncludeFolders ${CurrentTargetDependencyInclude})
-    endif()
-    
+    list(APPEND IncludeFolders ${CMAKE_CURRENT_SOURCE_DIR}/Include)
+
    foreach(Dependency IN LISTS BigfootDependencies)
-        get_target_property(DependencyInclude ${Dependency} INCLUDE_DIRECTORIES)
-        if(DependencyInclude)
-            list(APPEND IncludeFolders ${DependencyInclude})
+        if(TARGET ${Dependency})
+            get_target_property(DependencyIncludeDirs ${Dependency} INTERFACE_INCLUDE_DIRECTORIES)
+            if(DependencyIncludeDirs)
+                foreach(Dir IN LISTS DependencyIncludeDirs)
+                    # Strip $<BUILD_INTERFACE:...> generator expression
+                    if(Dir MATCHES "^\\$<BUILD_INTERFACE:(.+)>$")
+                        list(APPEND IncludeFolders "${CMAKE_MATCH_1}")
+                    elseif(NOT Dir MATCHES "^\\$<")
+                        # Pass through plain paths, skip other generator expressions
+                        list(APPEND IncludeFolders "${Dir}")
+                    endif()
+                endforeach()
+            endif()
        endif()
    endforeach()

@@ -58,7 +65,7 @@ function(bigfoot_compile_flatbuffers BigfootDependencies)
    file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Include/*.fbs")
    foreach(SOURCE_FILE IN LISTS SOURCES)
        get_filename_component(SOURCE_DIRECTORY ${SOURCE_FILE} DIRECTORY)
-
+        get_filename_component(SOURCE_NAME_WE ${SOURCE_FILE} NAME_WE)
        set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${SOURCE_FILE})

        execute_process(
@@ -80,66 +87,16 @@ function(bigfoot_compile_flatbuffers BigfootDependencies)
                    --cpp-include "EASTL/unique_ptr.h"
                    --cpp-include "EASTL/string.h"
                    -o "${SOURCE_DIRECTORY}"
-                    "${SOURCE_FILE}" 
+                    "${SOURCE_FILE}"
+        )
+
+        execute_process(
+            COMMAND ${BIN2CPP_EXECUTABLE}
+                    --input "${SOURCE_FILE}"
+                    --output "${SOURCE_DIRECTORY}/${SOURCE_NAME_WE}.fbs_generated.hpp"
+                    --arrayType eastl::array
+                    --arrayInclude <EASTL/array.h>
+                    --namespace Bigfoot
        )
    endforeach()
-endfunction()
-
-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 SHARED_BINARIES ${CONAN_DEPLOYER_DIR}/*mimalloc*.dll)
-        elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-            file(GLOB_RECURSE SHARED_BINARIES ${CONAN_DEPLOYER_DIR}/*mimalloc*.so*)
-        endif()
-
-        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(${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()
-            foreach(file ${SHARED_BINARIES})
-                if(file MATCHES "/${CMAKE_BUILD_TYPE}/")
-                    list(APPEND SHARED_BINARIES_${CMAKE_BUILD_TYPE} ${file})
-                endif()
-            endforeach()
-
-            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_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()