Cleanup linking

CMake/Package.cmake

@@ -3,47 +3,10 @@ function(bigfoot_create_package_lib PackagePublicDependencies PackagePrivateDepe
 
     target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
 
-    bigfoot_compile_flatbuffers("${PackageBigfootPublicDependencies}")
-
-    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
-            ${_SOURCES}
-            ${_OTHERS}
-        PUBLIC
-            FILE_SET HEADERS
-            BASE_DIRS
-                ${CMAKE_CURRENT_SOURCE_DIR}/Include
-            FILES
-                ${_HEADERS}
-    )
-
     target_link_libraries(${PROJECT_NAME}
         PRIVATE
             BigfootCompileAndLinkFlags
         PUBLIC
-            unordered_dense::unordered_dense
-            EASTL::EASTL
-            flatbuffers::flatbuffers
-            rapidhash::rapidhash
-            
             ${PackagePublicDependencies}
             $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPublicDependencies}>
 
@@ -51,17 +14,7 @@ function(bigfoot_create_package_lib PackagePublicDependencies PackagePrivateDepe
             ${PackagePrivateDependencies}
             $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageBigfootPrivateDependencies}>)
 
-    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})
-
-    target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
-
-    bigfoot_compile_flatbuffers("${BigfootDependencies}")
+    bigfoot_compile_flatbuffers()
 
     file(GLOB_RECURSE _SOURCES
             CONFIGURE_DEPENDS
@@ -93,14 +46,54 @@ function(bigfoot_create_package_tests ParentFolder BigfootDependencies)
                 ${_HEADERS}
     )
 
+    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)
+    add_executable(${PROJECT_NAME})
+
+    target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
+
     target_link_libraries(${PROJECT_NAME}
         PRIVATE
             BigfootCompileAndLinkFlags
-
-        PRIVATE
             $<LINK_LIBRARY:WHOLE_ARCHIVE,${PackageName}>
             gtest::gtest)
 
+    bigfoot_compile_flatbuffers()
+
+    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
+            ${_SOURCES}
+            ${_OTHERS}
+        PUBLIC
+            FILE_SET HEADERS
+            BASE_DIRS
+                ${CMAKE_CURRENT_SOURCE_DIR}/Include
+            FILES
+                ${_HEADERS}
+    )
+
     include(GoogleTest)
     gtest_discover_tests(${PROJECT_NAME} XML_OUTPUT_DIR ${CMAKE_BINARY_DIR}/TestResults/)