diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-24 00:03:37 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-24 12:00:12 +0100 |
| commit | 195d6cded05f7ef5bde695ee047b341a0265eab3 (patch) | |
| tree | af6ffa3622ae9bf7f2f5f065e269e86a019af854 /test/unit/CMakeLists.txt | |
| parent | c211b001d2a4c9b36034a812650f1a2ac693ee54 (diff) | |
| download | colobot-195d6cded05f7ef5bde695ee047b341a0265eab3.tar.gz colobot-195d6cded05f7ef5bde695ee047b341a0265eab3.tar.bz2 colobot-195d6cded05f7ef5bde695ee047b341a0265eab3.zip | |
Fixed timer functions on win32
* changed win32 implementation to QueryPerformaceTimer system function
* refactored system utils code
* proper tests for time utils and update event creation in application
* should fix issue #134
Diffstat (limited to 'test/unit/CMakeLists.txt')
| -rw-r--r-- | test/unit/CMakeLists.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index f3be01d..3d8a38c 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -16,9 +16,9 @@ endif() configure_file(${SRC_DIR}/common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common/config.h) # Platform-dependent implementation of system.h -if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") +if (${PLATFORM_WINDOWS}) set(SYSTEM_CPP_MODULE "system_windows.cpp") -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +elseif(${PLATFORM_LINUX}) set(SYSTEM_CPP_MODULE "system_linux.cpp") else() set(SYSTEM_CPP_MODULE "system_other.cpp") @@ -164,17 +164,16 @@ endif() # Platform-dependent tests -if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - #TODO: set(PLATFORM_TESTS app/system_windows_test.cpp) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if (${PLATFORM_WINDOWS}) + set(PLATFORM_TESTS app/system_windows_test.cpp) +elseif(${PLATFORM_LINUX}) set(PLATFORM_TESTS app/system_linux_test.cpp) -else() - #TODO: set(PLATFORM_TESTS app/system_other_test.cpp) endif() # Tests set(UT_SOURCES main.cpp +app/app_test.cpp graphics/engine/lightman_test.cpp math/geometry_test.cpp math/matrix_test.cpp |