Merge pull request #48 from SirRade/development

Cleanup
janhohenheim · Sep 22, 2016 · 0f825fe · 0f825fe
2 parents 5f7a32b + a64dfae
commit 0f825fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/Tests/EvenNumbers/CMakeLists.txt b/Tests/EvenNumbers/CMakeLists.txt
@@ -1,6 +1,7 @@
-file(GLOB SOURCES Sources/Headers/*.h Sources/Implementations/*.cpp Sources/*.cpp ../TestingUtilities/Sources/Headers/*.h ../TestingUtilities/Sources/Implementations/*.cpp)
+file(GLOB SOURCES Sources/Implementations/*.cpp)
 
-add_executable(Evenness ${SOURCES})
-target_link_libraries(Evenness Hippocrates)
+add_executable(EvenNumbers_EXAMPLE ${SOURCES})
+target_link_libraries(EvenNumbers_EXAMPLE Hippocrates)
+target_include_directories(EvenNumbers_EXAMPLE PUBLIC ../TestingUtilities/Sources/Headers)
 
-add_test(EvenNumbers ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Evenness)
+add_test(EvenNumbers ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/EvenNumbers_EXAMPLE)
diff --git a/Tests/EvenNumbers/Sources/Implementations/main.cpp b/Tests/EvenNumbers/Sources/Implementations/main.cpp
@@ -1,6 +1,4 @@
-// TODO: Replace with library import
-#include "../../../TestingUtilities/Sources/Headers/testing_utilities.h"
-
+#include "testing_utilities.h"
 
 using namespace std;
 using namespace Hippocrates;

diff --git a/Tests/XOR/CMakeLists.txt b/Tests/XOR/CMakeLists.txt
@@ -1,6 +1,7 @@
-file(GLOB SOURCES Sources/Headers/*.h Sources/Implementations/*.cpp Sources/*.cpp ../TestingUtilities/Sources/Headers/*.h ../TestingUtilities/Sources/Implementations/*.cpp)
+file(GLOB SOURCES Sources/Implementations/*.cpp)
 
 add_executable(XOR_EXAMPLE ${SOURCES})
 target_link_libraries(XOR_EXAMPLE Hippocrates)
+target_include_directories(XOR_EXAMPLE PUBLIC ../TestingUtilities/Sources/Headers)
 
 add_test(XOR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/XOR_EXAMPLE)
diff --git a/Tests/XOR/Sources/Implementations/main.cpp b/Tests/XOR/Sources/Implementations/main.cpp
@@ -1,7 +1,5 @@
 #include <fstream>
-
-// TODO: Replace with library import
-#include "../../../TestingUtilities/Sources/Headers/testing_utilities.h"
+#include "testing_utilities.h"
 
 using namespace std;
 using namespace Hippocrates;