From eb480f02b8791ce726124dd636897a6557d4caa8 Mon Sep 17 00:00:00 2001 From: legatt Date: Wed, 6 Aug 2025 18:14:50 +0300 Subject: [PATCH] Static linking instead of DLL --- ECSAPI/ECS/CMakeLists.txt | 2 +- ECSAPI/ECS/test/CMakeLists.txt | 8 -------- ECSAPI/Economy/CMakeLists.txt | 2 +- ECSAPI/Economy/test/CMakeLists.txt | 8 -------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/ECSAPI/ECS/CMakeLists.txt b/ECSAPI/ECS/CMakeLists.txt index eac2e13..f215987 100644 --- a/ECSAPI/ECS/CMakeLists.txt +++ b/ECSAPI/ECS/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(EnTT CONFIG REQUIRED) # Link library -add_library(ECS SHARED ${HEADERS} ${SOURCES}) +add_library(ECS ${HEADERS} ${SOURCES}) add_library(ECS::ECS ALIAS ECS) target_link_libraries(ECS PUBLIC Economy::Economy) diff --git a/ECSAPI/ECS/test/CMakeLists.txt b/ECSAPI/ECS/test/CMakeLists.txt index be35148..0f11be0 100644 --- a/ECSAPI/ECS/test/CMakeLists.txt +++ b/ECSAPI/ECS/test/CMakeLists.txt @@ -20,12 +20,4 @@ if (CMAKE_VERSION VERSION_GREATER 3.12) set_property(TARGET ecs_tests PROPERTY CXX_STANDARD 20) endif() -if (WIN32) - add_custom_command( - TARGET ecs_tests POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $ - COMMAND_EXPAND_LISTS - ) -endif () - gtest_discover_tests(ecs_tests) \ No newline at end of file diff --git a/ECSAPI/Economy/CMakeLists.txt b/ECSAPI/Economy/CMakeLists.txt index 69c12c8..be3931e 100644 --- a/ECSAPI/Economy/CMakeLists.txt +++ b/ECSAPI/Economy/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(EnTT CONFIG REQUIRED) # Link library -add_library(Economy SHARED ${HEADERS} ${HEADERS_COMPONENTS} ${SOURCES} ${SOURCES_SYSTEMS}) +add_library(Economy ${HEADERS} ${HEADERS_COMPONENTS} ${SOURCES} ${SOURCES_SYSTEMS}) add_library(Economy::Economy ALIAS Economy) target_link_libraries(Economy PRIVATE EnTT::EnTT) diff --git a/ECSAPI/Economy/test/CMakeLists.txt b/ECSAPI/Economy/test/CMakeLists.txt index b43b3ea..306f0a4 100644 --- a/ECSAPI/Economy/test/CMakeLists.txt +++ b/ECSAPI/Economy/test/CMakeLists.txt @@ -21,12 +21,4 @@ if (CMAKE_VERSION VERSION_GREATER 3.12) set_property(TARGET economy_tests PROPERTY CXX_STANDARD 20) endif() -if (WIN32) - add_custom_command( - TARGET economy_tests POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $ - COMMAND_EXPAND_LISTS - ) -endif () - gtest_discover_tests(economy_tests) \ No newline at end of file