From 79af252d8a887deea10d50ebb69e84524859312a Mon Sep 17 00:00:00 2001 From: MassiveAtoms Date: Sat, 29 Jun 2019 18:43:56 +0000 Subject: [PATCH 1/2] CMakeLists.txt for easy building --- CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..f80635a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.14) +project(park) + +set(CMAKE_CXX_STANDARD 11) + + + +add_executable(park + main.cpp + Customer.cpp + headers/Customer.h + Park_spot.cpp + headers/Park_spot.h + Park_time.cpp + headers/Park_time.h + ) \ No newline at end of file From 96bce5d3f677e355a98258eec63fd0e0da178dab Mon Sep 17 00:00:00 2001 From: MassiveAtoms Date: Sun, 30 Jun 2019 15:33:15 -0300 Subject: [PATCH 2/2] for merge resolution --- CMakeLists.txt | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index f80635a..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(park) - -set(CMAKE_CXX_STANDARD 11) - - - -add_executable(park - main.cpp - Customer.cpp - headers/Customer.h - Park_spot.cpp - headers/Park_spot.h - Park_time.cpp - headers/Park_time.h - ) \ No newline at end of file