From 1db4882cdae24a9ed85c4fcdf43ea2b5d53c086b Mon Sep 17 00:00:00 2001 From: KimLS Date: Sun, 7 Dec 2025 19:40:35 -0800 Subject: [PATCH] Fix client files, loginserver and tests --- CMakeLists.txt | 22 +++++++++++----------- client_files/export/CMakeLists.txt | 2 +- client_files/import/CMakeLists.txt | 2 +- loginserver/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29327f53c..22c725dab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,14 +166,14 @@ if(EQEMU_BUILD_SERVER) add_subdirectory(eqlaunch) endif() -#if(EQEMU_BUILD_LOGIN) -# add_subdirectory(loginserver) -#endif() -# -#if(EQEMU_BUILD_TESTS) -# add_subdirectory(tests) -#endif() -# -#if(EQEMU_BUILD_CLIENT_FILES) -# add_subdirectory(client_files) -#endif() +if(EQEMU_BUILD_LOGIN) + add_subdirectory(loginserver) +endif() + +if(EQEMU_BUILD_TESTS) + add_subdirectory(tests) +endif() + +if(EQEMU_BUILD_CLIENT_FILES) + add_subdirectory(client_files) +endif() diff --git a/client_files/export/CMakeLists.txt b/client_files/export/CMakeLists.txt index a127963b6..c35a22efe 100644 --- a/client_files/export/CMakeLists.txt +++ b/client_files/export/CMakeLists.txt @@ -11,6 +11,6 @@ add_executable(export_client_files ${export_sources} ${export_headers}) install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -target_link_libraries(export_client_files ${SERVER_LIBS}) +target_link_libraries(export_client_files common) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) diff --git a/client_files/import/CMakeLists.txt b/client_files/import/CMakeLists.txt index 2643090af..af7f4da0c 100644 --- a/client_files/import/CMakeLists.txt +++ b/client_files/import/CMakeLists.txt @@ -11,6 +11,6 @@ add_executable(import_client_files ${import_sources} ${import_headers}) install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -target_link_libraries(import_client_files ${SERVER_LIBS}) +target_link_libraries(import_client_files common) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt index 67729481b..b576031dd 100644 --- a/loginserver/CMakeLists.txt +++ b/loginserver/CMakeLists.txt @@ -30,6 +30,6 @@ add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers}) install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -target_link_libraries(loginserver ${SERVER_LIBS}) +target_link_libraries(loginserver common) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e38dc7066..7fa45d2fc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -21,7 +21,7 @@ set(tests_headers add_executable(tests ${tests_sources} ${tests_headers}) -target_link_libraries(tests common cppunit ${SERVER_LIBS}) +target_link_libraries(tests common cppunit) install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)