From b99ca80eaa15e93b6d0bda5138a5cf016f32cd04 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sat, 30 May 2020 22:41:20 +0300 Subject: [PATCH] test: Enable building of tests --- src/CMakeLists.txt | 1 + src/test/integtests/CMakeLists.txt | 39 ++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3a8e83eb..55aad09d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib) add_subdirectory(lib) add_subdirectory(cmd) +add_subdirectory(test) if (BARRIER_BUILD_GUI) add_subdirectory(gui) diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt index a412ecc0..3b2649b9 100644 --- a/src/test/integtests/CMakeLists.txt +++ b/src/test/integtests/CMakeLists.txt @@ -14,24 +14,37 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -file(GLOB_RECURSE headers "*.h") -file(GLOB_RECURSE sources "*.cpp") - -# remove platform files (specific platform added later). -file(GLOB_RECURSE remove_platform "platform/*") -list(REMOVE_ITEM headers ${remove_platform}) -list(REMOVE_ITEM sources ${remove_platform}) +set(headers +) +set(sources + arch/ArchInternetTests.cpp + ipc/IpcTests.cpp + net/NetworkTests.cpp + Main.cpp +) # platform if (WIN32) - file(GLOB platform_sources "platform/MSWindows*.cpp") - file(GLOB platform_headers "platform/MSWindows*.h") + set(platform_sources + platform/MSWindowsClipboardTests.cpp + platform/MSWindowsKeyStateTests.cpp + ) + set(platform_headers) elseif (APPLE) - file(GLOB platform_sources "platform/OSX*.cpp") - file(GLOB platform_headers "platform/OSX*.h") + set(platform_sources + platform/OSXClipboardTests.cpp + platform/OSXKeyStateTests.cpp + platform/OSXScreenTests.cpp + ) + set(platform_headers) elseif (UNIX) - file(GLOB platform_sources "platform/XWindows*.cpp") - file(GLOB platform_headers "platform/XWindows*.h") + set(platform_sources + platform/XWindowsClipboardTests.cpp + platform/XWindowsKeyStateTests.cpp + platform/XWindowsScreenSaverTests.cpp + platform/XWindowsScreenTests.cpp + ) + set(platform_headers) endif() list(APPEND sources ${platform_sources})