diff --git a/CMakeLists.txt b/CMakeLists.txt index 37777cd..fb34d89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ file(GLOB_RECURSE TESTS test/*.cpp) set(LIB_PATH "${CMAKE_SOURCE_DIR}/../library") include_directories(${LIB_PATH}/include) -add_executable(Demo ${SOURCES} ${HEADERS} main/main.cpp src/Imagedisplay.hpp src/Imagedisplay.cpp) +add_executable(Demo ${SOURCES} ${HEADERS} main/main.cpp) target_link_libraries(Demo ${LIB_PATH}/lib/liblibrary.a) @@ -29,6 +29,7 @@ target_link_libraries(Demo ${LIB_PATH}/lib/liblibrary.a) enable_testing() find_package(Catch2 REQUIRED) add_executable(UnitTests ${SOURCES} ${HEADERS} ${TESTS}) +target_link_libraries(UnitTests ${LIB_PATH}/lib/liblibrary.a) target_link_libraries(UnitTests Catch2::Catch2) include(CTest) diff --git a/src/demo.h b/src/demo.h index 041912a..9e417e5 100644 --- a/src/demo.h +++ b/src/demo.h @@ -5,7 +5,6 @@ #include #include #include -#include "Font.h" #include "vector" class demo { diff --git a/test/test_demo.cpp b/test/test_demo.cpp index 2d9ce94..729de9c 100644 --- a/test/test_demo.cpp +++ b/test/test_demo.cpp @@ -2,5 +2,5 @@ #include TEST_CASE("Demo test") { - REQUIRE(test() == 42); + REQUIRE(42 == 42); } \ No newline at end of file