diff --git a/.gitignore b/.gitignore index 4b2dc5ec7..da4ba72e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ IndividualMiniprojectC++/.vscode/ -IndividualMiniprojectC++/external_libraries/boost_1_85_0 +IndividualMiniprojectC++/external_libraries/boost_1_86_0 IndividualMiniprojectC++/external_libraries/Crow-1.2.0-Darwin IndividualMiniprojectC++/build/* !IndividualMiniprojectC++/build/README.txt diff --git a/IndividualMiniprojectC++/CMakeLists.txt b/IndividualMiniprojectC++/CMakeLists.txt index ed2cd10fe..15cdd9199 100644 --- a/IndividualMiniprojectC++/CMakeLists.txt +++ b/IndividualMiniprojectC++/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15) project(IndividualMiniproject) -set(INCLUDE_PATHS external_libraries/boost_1_85_0 external_libraries/Crow-1.2.0-Darwin/include) +set(INCLUDE_PATHS external_libraries/boost_1_86_0 external_libraries/Crow-1.2.0-Darwin/include) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -30,7 +30,7 @@ FetchContent_MakeAvailable(googletest) target_include_directories(IndividualMiniproject PUBLIC ${INCLUDE_PATHS} include - /opt/homebrew/Cellar/asio/1.30.2/include + /usr/include/asio ) target_link_libraries(IndividualMiniproject PRIVATE @@ -52,7 +52,7 @@ add_executable(IndividualMiniprojectTests target_include_directories(IndividualMiniprojectTests PRIVATE ${INCLUDE_PATHS} include - /opt/homebrew/Cellar/asio/1.30.2/include + /usr/include/asio ) target_link_libraries(IndividualMiniprojectTests PRIVATE diff --git a/IndividualMiniprojectC++/src/Course.cpp b/IndividualMiniprojectC++/src/Course.cpp index d2eb5aa12..c55bd5bed 100644 --- a/IndividualMiniprojectC++/src/Course.cpp +++ b/IndividualMiniprojectC++/src/Course.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include "Course.h" #include #include diff --git a/IndividualMiniprojectC++/src/Department.cpp b/IndividualMiniprojectC++/src/Department.cpp index f4aa51860..d05e5f1c8 100644 --- a/IndividualMiniprojectC++/src/Department.cpp +++ b/IndividualMiniprojectC++/src/Department.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include "Department.h" #include "Course.h" #include diff --git a/IndividualMiniprojectC++/src/Globals.cpp b/IndividualMiniprojectC++/src/Globals.cpp index ebf157ff8..177ff0bbc 100644 --- a/IndividualMiniprojectC++/src/Globals.cpp +++ b/IndividualMiniprojectC++/src/Globals.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include "Globals.h" MyFileDatabase* globalDatabase = nullptr; \ No newline at end of file diff --git a/IndividualMiniprojectC++/src/MyApp.cpp b/IndividualMiniprojectC++/src/MyApp.cpp index a815436d2..38cff92d4 100644 --- a/IndividualMiniprojectC++/src/MyApp.cpp +++ b/IndividualMiniprojectC++/src/MyApp.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include "MyApp.h" #include diff --git a/IndividualMiniprojectC++/src/MyFileDatabase.cpp b/IndividualMiniprojectC++/src/MyFileDatabase.cpp index 034049f92..39ed62a48 100644 --- a/IndividualMiniprojectC++/src/MyFileDatabase.cpp +++ b/IndividualMiniprojectC++/src/MyFileDatabase.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include "MyFileDatabase.h" #include #include diff --git a/IndividualMiniprojectC++/src/RouteController.cpp b/IndividualMiniprojectC++/src/RouteController.cpp index c183c2a79..071d18db5 100644 --- a/IndividualMiniprojectC++/src/RouteController.cpp +++ b/IndividualMiniprojectC++/src/RouteController.cpp @@ -1,11 +1,13 @@ +// Copyright 2024 Jacob Aaronson + #include "RouteController.h" -#include "Globals.h" -#include "MyFileDatabase.h" -#include "crow.h" #include #include #include #include +#include "Globals.h" +#include "MyFileDatabase.h" +#include "../external_libraries/Crow-1.2.0-Darwin/include/crow.h" // Utility function to handle exceptions crow::response handleException(const std::exception& e) { diff --git a/IndividualMiniprojectC++/src/main.cpp b/IndividualMiniprojectC++/src/main.cpp index bdce13c03..ca22c930b 100644 --- a/IndividualMiniprojectC++/src/main.cpp +++ b/IndividualMiniprojectC++/src/main.cpp @@ -1,14 +1,16 @@ -#include "crow.h" -#include "Course.h" -#include "Department.h" -#include "MyFileDatabase.h" -#include "RouteController.h" -#include "Globals.h" -#include "MyApp.h" +// Copyright 2024 Jacob Aaronson + #include #include #include #include +#include "../external_libraries/Crow-1.2.0-Darwin/include/crow.h" +#include "Globals.h" +#include "MyApp.h" +#include "Course.h" +#include "Department.h" +#include "MyFileDatabase.h" +#include "RouteController.h" /** * Method to handle proper termination protocols diff --git a/IndividualMiniprojectC++/test/CourseUnitTests.cpp b/IndividualMiniprojectC++/test/CourseUnitTests.cpp index eb2e2d5f7..6dbd8c751 100644 --- a/IndividualMiniprojectC++/test/CourseUnitTests.cpp +++ b/IndividualMiniprojectC++/test/CourseUnitTests.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include #include "Course.h" diff --git a/IndividualMiniprojectC++/test/sample.cpp b/IndividualMiniprojectC++/test/sample.cpp index 5a57e138f..14cb208c2 100644 --- a/IndividualMiniprojectC++/test/sample.cpp +++ b/IndividualMiniprojectC++/test/sample.cpp @@ -1,3 +1,5 @@ +// Copyright 2024 Jacob Aaronson + #include // Demonstrate some basic assertions.