Migrating from boost test to google test.

test/CMakeLists.txt

@@ -3,28 +3,32 @@ project(test)
 enable_testing()
 include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/test)
 include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
+find_package(GTest REQUIRED)
+include_directories(${GTEST_INCLUDE_DIRS})
 
 set(test_SRCS
-		StdInc.cpp
+ 		StdInc.cpp
+ 		main.cpp
+ 		CMemoryBufferTest.cpp
+ 		CVcmiTestConfig.cpp
+ 
+ 		battle/BattleHexTest.cpp
+ 		battle/CHealthTest.cpp
 
-		Battlefield.cpp
-		CMapEditManagerTest.cpp
-		CMapFormatTest.cpp
-		CMemoryBufferTest.cpp
-		CVcmiTestConfig.cpp
-		MapComparer.cpp
-                battle/CHealthTest.cpp
+ 		map/CMapEditManagerTest.cpp
+ 		map/CMapFormatTest.cpp
+ 		map/MapComparer.cpp
 )
 
 set(test_HEADERS
-		StdInc.h
-
-		CVcmiTestConfig.h
-		MapComparer.h
+ 		StdInc.h
+ 
+ 		CVcmiTestConfig.h
+ 		map/MapComparer.h
 )
 
 add_executable(vcmitest ${test_SRCS} ${test_HEADERS})
-target_link_libraries(vcmitest vcmi ${Boost_LIBRARIES} ${RT_LIB} ${DL_LIB})
+target_link_libraries(vcmitest vcmi gtest ${RT_LIB} ${DL_LIB})
 add_test(vcmitest vcmitest)
 
 vcmi_set_output_dir(vcmitest "")
@@ -44,7 +48,7 @@ set(vcmitest_FILES
 )
 
 foreach(file ${vcmitest_FILES})
-                add_custom_command(TARGET vcmitestFiles POST_BUILD
-                                COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${file}" ${CMAKE_CURRENT_BINARY_DIR}
-        )
+		add_custom_command(TARGET vcmitestFiles POST_BUILD
+				COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${file}" ${CMAKE_CURRENT_BINARY_DIR}
+	)
 endforeach()