From ba67f6ea37e89a789963f9f916aabd958c8b99ba Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 1 Oct 2015 10:53:29 +0200 Subject: [PATCH] Tests fixed into working order --- src/tests/CMakeLists.txt | 11 +++++------ src/tests/EventFixture.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index ae7d47f..13604e2 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,18 +1,17 @@ project(tests) +find_package(PNG REQUIRED) find_package(Boost REQUIRED COMPONENTS chrono thread unit_test_framework) include_directories( ${CMAKE_SOURCE_DIR}/include + ${PNG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) -set(SOURCE_FILES - main.cpp - FileWatcherTest.cpp - EventTest.cpp - ComponentCopyTest.cpp - EntityCloneTest.cpp + +file(GLOB SOURCE_FILES + "*.cpp" ) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/src/tests/EventFixture.h b/src/tests/EventFixture.h index ef9acbf..1548a08 100644 --- a/src/tests/EventFixture.h +++ b/src/tests/EventFixture.h @@ -40,7 +40,7 @@ struct EventFixture // Publish the event this->EventBroker->Publish(Before); // Clear to swap buffers - this->EventBroker->Clear(); + this->EventBroker->Swap(); // Process the event this->EventBroker->template Process(); }