From 6e6af92d3b4875c6dcf3adcbed4f41e27db34c0a Mon Sep 17 00:00:00 2001 From: ErikWB Date: Mon, 25 Jan 2016 10:18:07 +0100 Subject: [PATCH] Fixed error building combined unit tests on windows. If not building Tinia_SERVER, removes tests requiring IPC. --- unittests/combined/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unittests/combined/CMakeLists.txt b/unittests/combined/CMakeLists.txt index ec344d1..269eb40 100644 --- a/unittests/combined/CMakeLists.txt +++ b/unittests/combined/CMakeLists.txt @@ -4,6 +4,12 @@ FILE( GLOB combinedTestSrc "../*/*.cpp" ) file( GLOB mainApps "../*/main.cpp" ) list( REMOVE_ITEM combinedTestSrc ${mainApps} ) +IF( NOT Tinia_SERVER ) + #The following files are only applicable for Tinia_Server + FILE( GLOB toRemove "../*/test_*.cpp" ) + LIST( REMOVE_ITEM combinedTestSrc ${toRemove} ) +ENDIF( WIN32 ) + file( GLOB combinedMain main.cpp ) # Assuming absolute path is a good thing list( APPEND combinedTestSrc ${combinedMain} )