From edaa99404be6d7f5e6ad735f608cbdb572689c52 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 2 May 2020 09:16:14 +0200 Subject: [PATCH] Fixed all the project folder refs in the build scripts. --- .gitmodules | 3 +++ week-03/CMakeLists.txt | 4 ++-- week-04/CMakeLists.txt | 6 +++--- week-05/CMakeLists.txt | 4 ++-- week-06/CMakeLists.txt | 16 +++++++++------- week-07/CMakeLists.txt | 4 ++-- week-09/CMakeLists.txt | 4 ++-- week-10/CMakeLists.txt | 4 ++-- week-15 | 1 + 9 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 .gitmodules create mode 160000 week-15 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3870acb --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "week-15"] + path = week-15 + url = git@git.vdm.dev:Llewellyn/game-of-life.git diff --git a/week-03/CMakeLists.txt b/week-03/CMakeLists.txt index 04de2fe..62889a8 100644 --- a/week-03/CMakeLists.txt +++ b/week-03/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -project(Week3) +project(week-03) set(CMAKE_CXX_STANDARD 14) # uncomment the one we are working on -add_executable(Week3 +add_executable(week-03 # bmi.cpp # findErrors.cpp icecream.cpp diff --git a/week-04/CMakeLists.txt b/week-04/CMakeLists.txt index eeec1bc..cdfa209 100644 --- a/week-04/CMakeLists.txt +++ b/week-04/CMakeLists.txt @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -project(Week4) +project(week-04) set(CMAKE_CXX_STANDARD 14) # uncomment the one we are working on -add_executable(Week4 -# testNum.cpp +add_executable(week-04 + testNum.cpp # Week4_areas.cpp # Week4_Color-1.cpp # Week4_Color-2.cpp diff --git a/week-05/CMakeLists.txt b/week-05/CMakeLists.txt index 7817216..def2daa 100644 --- a/week-05/CMakeLists.txt +++ b/week-05/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -project(Week5) +project(week-05) set(CMAKE_CXX_STANDARD 14) # uncomment the one we are working on -add_executable(Week5 +add_executable(week-05 # Week5_areas2.cpp Week5_cookies.cpp # Week5_loops.cpp diff --git a/week-06/CMakeLists.txt b/week-06/CMakeLists.txt index 0fc443d..99b9b61 100644 --- a/week-06/CMakeLists.txt +++ b/week-06/CMakeLists.txt @@ -1,12 +1,14 @@ cmake_minimum_required(VERSION 3.15) -project(Week6) +project(week-06) set(CMAKE_CXX_STANDARD 14) -add_executable(Week6 +# uncomment the one your working on +add_executable(week-06 Week6_areas3.cpp - Week6_areas4.cpp - Week6_choice.cpp - Week6_fortunes.cpp - Week6_kiloConverter.cpp - Week6_swapNums.cpp) +# Week6_areas4.cpp +# Week6_choice.cpp +# Week6_fortunes.cpp +# Week6_kiloConverter.cpp +# Week6_swapNums.cpp +) diff --git a/week-07/CMakeLists.txt b/week-07/CMakeLists.txt index 95481a3..8dd479d 100644 --- a/week-07/CMakeLists.txt +++ b/week-07/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.16) -project(Week7) +project(week-07) set(CMAKE_CXX_STANDARD 14) -add_executable(Week7 +add_executable(week-07 main.cpp Sheet.txt) diff --git a/week-09/CMakeLists.txt b/week-09/CMakeLists.txt index ec65756..255990a 100644 --- a/week-09/CMakeLists.txt +++ b/week-09/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(Week9) +project(week-09) set(CMAKE_CXX_STANDARD 14) -add_executable(Week9 Week9_functions.cpp) \ No newline at end of file +add_executable(week-09 Week9_functions.cpp) diff --git a/week-10/CMakeLists.txt b/week-10/CMakeLists.txt index 33c3e79..afa2e40 100644 --- a/week-10/CMakeLists.txt +++ b/week-10/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(Week10) +project(week-10) set(CMAKE_CXX_STANDARD 14) -add_executable(Week10 main.cpp Test.cpp) \ No newline at end of file +add_executable(week-10 main.cpp Test.cpp) diff --git a/week-15 b/week-15 new file mode 160000 index 0000000..e11c826 --- /dev/null +++ b/week-15 @@ -0,0 +1 @@ +Subproject commit e11c82616389fa52e198e1e21adb5deb1c4b0015