Skip to content

Fixed error building combined unit tests on windows. #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrGaribaldi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed error building combined unit tests on windows. #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions unittests/combined/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} )

Expand Down