From b14d8ab6d96a4393b85e88c9f388599e89fdbe1a Mon Sep 17 00:00:00 2001
From: Grigoris Pavlakis <gregory.pavlakis@gmail.com>
Date: Fri, 23 Nov 2018 23:53:06 +0000
Subject: [PATCH] Delete CMakeLists.txt.orig
---
CMakeLists.txt.orig | 31 -------------------------------
1 file changed, 31 deletions(-)
delete mode 100644 CMakeLists.txt.orig
diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig
deleted file mode 100644
index fde62d5c..00000000
--- a/CMakeLists.txt.orig
+++ /dev/null
@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-project(ecss_services)
-
-# Set C++ version to c++17
-set(CMAKE_CXX_STANDARD 17)
-
-# Specify the directories for #includes
-include_directories("${PROJECT_SOURCE_DIR}/inc")
-
-add_custom_target(check
- COMMAND ./cppcheck.sh
- COMMAND ./vera.sh
- COMMAND ./clang-tidy.sh
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/ci")
-
-# Specify the .cpp files for the executables
-<<<<<<< HEAD
-add_executable(ecss_services src/main.cpp src/Message.cpp src/Service.cpp src/Services/TestService.cpp inc/Services/ParameterService.hpp src/Services/ParameterService.cpp)
-=======
-add_executable(ecss_services src/main.cpp src/Message.cpp src/Service.cpp
- src/Services/TestService.cpp src/Services/RequestVerificationService.cpp)
-
-IF (EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
- add_subdirectory(lib/Catch2)
- add_executable(tests src/Message.cpp src/Services/TestService.cpp
- src/Services/RequestVerificationService.cpp test/tests.cpp
- test/Message.cpp test/TestPlatform.cpp test/Services/TestService.cpp
- test/Services/RequestVerificationService.cpp)
- target_link_libraries(tests Catch2::Catch2)
-ENDIF ()
->>>>>>> master
--
GitLab