From 5a8bb8741d8940d83088ad765adc002032dc2a84 Mon Sep 17 00:00:00 2001
From: Grigoris Pavlakis <gregory.pavlakis@gmail.com>
Date: Mon, 26 Nov 2018 19:16:25 +0000
Subject: [PATCH] Revert "Update CMakeLists.txt"
This reverts commit 4e7997db9be8e2bd4d4b45d40bd5f786e12f8a31
---
CMakeLists.txt | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 275c58b1..27b0dd6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,16 +15,20 @@ add_custom_target(check
# Specify the .cpp files for the executables
add_executable(ecss_services src/main.cpp src/Message.cpp src/Service.cpp
+<<<<<<< CMakeLists.txt
src/Services/TestService.cpp
src/Services/RequestVerificationService.cpp
src/Services/MemoryManagementService.cpp
src/Services/ParameterService.cpp)
+=======
src/Services/TestService.cpp
src/Services/RequestVerificationService.cpp)
+>>>>>>> CMakeLists.txt
IF(EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
add_subdirectory(lib/Catch2)
add_executable(tests src/Message.cpp src/Services/TestService.cpp
+<<<<<<< CMakeLists.txt
src/Services/RequestVerificationService.cpp
src/Services/ParameterService.cpp
src/Services/MemoryManagementService.cpp
@@ -35,6 +39,10 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
test/Services/RequestVerificationService.cpp
test/Services/ParameterService.cpp
test/Services/MemoryManagementService.cpp)
-
+=======
+ src/Services/RequestVerificationService.cpp
+ test/tests.cpp test/Message.cpp test/TestPlatform.cpp test/Services/TestService.cpp
+ test/Services/RequestVerificationService.cpp)
+>>>>>>> CMakeLists.txt
target_link_libraries(tests Catch2::Catch2)
ENDIF()
--
GitLab