From 5e37ad683636b03c539203980078b48eb3c73a52 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 5 Dec 2022 22:57:43 +0200 Subject: [PATCH] Changes to single-app build - client version of library is now always called vcmi, like in regular builds (e.g. libvcmi.so) - server version of library keeps its separate name --- CMakeLists.txt | 7 ++----- lib/CMakeLists.txt | 3 +++ lib_client/CMakeLists.txt | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 lib_client/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 53aef7dd7..43c718a06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,13 +428,10 @@ if(APPLE_IOS) endif() include(VCMI_lib) +add_subdirectory(lib) +set(VCMI_LIB_TARGET vcmi) if(BUILD_SINGLE_APP) - add_subdirectory(lib_client) add_subdirectory(lib_server) - set(VCMI_LIB_TARGET vcmi_lib_client) -else() - add_subdirectory(lib) - set(VCMI_LIB_TARGET vcmi) endif() if(ENABLE_ERM) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d0536b245..ab1a5792d 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1 +1,4 @@ add_main_lib(vcmi SHARED) +if(BUILD_SINGLE_APP) + target_compile_definitions(vcmi PUBLIC VCMI_LIB_NAMESPACE=LIB_CLIENT) +endif() diff --git a/lib_client/CMakeLists.txt b/lib_client/CMakeLists.txt deleted file mode 100644 index f51966e22..000000000 --- a/lib_client/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_main_lib(vcmi_lib_client SHARED) -target_compile_definitions(vcmi_lib_client PUBLIC VCMI_LIB_NAMESPACE=LIB_CLIENT)