games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge branch 'develop' into handlersAbstraction

Browse Source 
# Conflicts:
#	CI/linux/before_install.sh
#	CI/mac/before_install.sh
#	CI/mxe/before_install.sh
#	lib/CModHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/CommonConstructors.cpp
#	server/CGameHandler.cpp
#	test/CMakeLists.txt
#	test/spells/effects/TeleportTest.cpp
This commit is contained in:
Andrii Danylchenko
2021-07-16 00:32:13 +03:00
parent 9e422a1664 3cef42fd1a
commit 9c8d776398
30 changed files with 1452 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/CMakeLists.txt
View File

@@ -90,11 +90,7 @@ set(test_SRCS
spells/targetConditions/ReceptiveFeatureConditionTest.cpp
spells/targetConditions/SpellEffectConditionTest.cpp
spells/targetConditions/TargetConditionItemFixture.cpp
vcai/mock_ResourceManager.cpp
vcai/mock_VCAI.cpp
vcai/ResurceManagerTest.cpp
mock/BattleFake.cpp
mock/mock_IGameCallback.cpp
mock/mock_MapService.cpp
@@ -147,16 +143,12 @@ set(mock_HEADERS
mock/mock_UnitInfo.h
mock/mock_vstd_RNG.h
mock/mock_CPSICallback.h
vcai/mock_ResourceManager.h
vcai/mock_VCAI.h
vcai/mock_VCAI_CGoal.h
)
add_subdirectory_with_folder("3rdparty" googletest EXCLUDE_FROM_ALL)
add_executable(vcmitest ${test_SRCS} ${test_HEADERS} ${mock_HEADERS})
target_link_libraries(vcmitest PRIVATE gtest gmock vcmi ${SYSTEM_LIBS} VCAI)
target_link_libraries(vcmitest PRIVATE gtest gmock vcmi ${SYSTEM_LIBS})
target_include_directories(vcmitest
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}