From b9f8d7c3b17da3cf9b7566eff4b8275551ce7c89 Mon Sep 17 00:00:00 2001 From: KimLS Date: Sun, 16 Nov 2025 22:26:34 -0800 Subject: [PATCH] Tests and more cmake version updates --- CMakeLists.txt | 8 ++++---- client_files/export/CMakeLists.txt | 2 +- client_files/import/CMakeLists.txt | 2 +- common/CMakeLists.txt | 2 +- libs/luabind/CMakeLists.txt | 2 +- libs/perlbind/CMakeLists.txt | 2 +- shared_memory/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 4 ++-- tests/cppunit/CMakeLists.txt | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4a14346e..a62656aad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,10 +312,10 @@ ENDIF(EQEMU_BUILD_SERVER) #IF(EQEMU_BUILD_HC) # ADD_SUBDIRECTORY(hc) #ENDIF(EQEMU_BUILD_HC) -# -#IF(EQEMU_BUILD_TESTS) -# ADD_SUBDIRECTORY(tests) -#ENDIF(EQEMU_BUILD_TESTS) + +IF(EQEMU_BUILD_TESTS) + ADD_SUBDIRECTORY(tests) +ENDIF(EQEMU_BUILD_TESTS) IF(EQEMU_BUILD_CLIENT_FILES) ADD_SUBDIRECTORY(client_files) diff --git a/client_files/export/CMakeLists.txt b/client_files/export/CMakeLists.txt index b7f15dddb..985a18b79 100644 --- a/client_files/export/CMakeLists.txt +++ b/client_files/export/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) SET(export_sources main.cpp diff --git a/client_files/import/CMakeLists.txt b/client_files/import/CMakeLists.txt index da08cda6e..673f6ec7f 100644 --- a/client_files/import/CMakeLists.txt +++ b/client_files/import/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) SET(import_sources main.cpp diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 5835a874b..81bff171d 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) SET(common_sources base_packet.cpp diff --git a/libs/luabind/CMakeLists.txt b/libs/luabind/CMakeLists.txt index b261f4c60..7410cf506 100644 --- a/libs/luabind/CMakeLists.txt +++ b/libs/luabind/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) SET(lb_sources src/class.cpp diff --git a/libs/perlbind/CMakeLists.txt b/libs/perlbind/CMakeLists.txt index c03dd8e3a..7facb84fe 100644 --- a/libs/perlbind/CMakeLists.txt +++ b/libs/perlbind/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.7) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) project(perlbind LANGUAGES CXX) diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt index c192e6540..7c62403bd 100644 --- a/shared_memory/CMakeLists.txt +++ b/shared_memory/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) SET(shared_memory_sources items.cpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6ed82f5b8..2310d765a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.2) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) ADD_SUBDIRECTORY(cppunit) @@ -21,7 +21,7 @@ SET(tests_headers ADD_EXECUTABLE(tests ${tests_sources} ${tests_headers}) -TARGET_LINK_LIBRARIES(tests common cppunit fmt ${SERVER_LIBS}) +TARGET_LINK_LIBRARIES(tests common cppunit ${SERVER_LIBS}) INSTALL(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) diff --git a/tests/cppunit/CMakeLists.txt b/tests/cppunit/CMakeLists.txt index 7b7e4c749..e8f602d82 100644 --- a/tests/cppunit/CMakeLists.txt +++ b/tests/cppunit/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.2) +CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0) SET(cppunit_sources collectoroutput.cpp