From 2da39359c6a3c81cff7885150c5e5a8063ea2c3a Mon Sep 17 00:00:00 2001
From: Sander Speetjens <sander.speetjens@gmail.com>
Date: Sun, 13 Nov 2022 19:52:19 +0100
Subject: [PATCH] Move cmdLineArgs lib to external

---
 external/CMakeLists.txt                       |  1 +
 external/cmdLineArgs/CMakeLists.txt           | 15 +++++++++
 {src => external/cmdLineArgs}/cmdLineArgs.cpp |  0
 {src => external/cmdLineArgs}/cmdLineArgs.hpp |  0
 external/cmdLineArgs/debug.hpp                | 21 ++++++++++++
 src/CMakeLists.txt                            | 32 ++++++++++---------
 tests/CMakeLists.txt                          | 21 ++++++++----
 7 files changed, 69 insertions(+), 21 deletions(-)
 create mode 100644 external/cmdLineArgs/CMakeLists.txt
 rename {src => external/cmdLineArgs}/cmdLineArgs.cpp (100%)
 rename {src => external/cmdLineArgs}/cmdLineArgs.hpp (100%)
 create mode 100644 external/cmdLineArgs/debug.hpp

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index e69de29..d2573be 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(cmdLineArgs)
\ No newline at end of file
diff --git a/external/cmdLineArgs/CMakeLists.txt b/external/cmdLineArgs/CMakeLists.txt
new file mode 100644
index 0000000..44ecaeb
--- /dev/null
+++ b/external/cmdLineArgs/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_library(cmdLineArgs "")
+target_sources(cmdLineArgs
+  PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmdLineArgs.cpp
+)
+
+target_include_directories(cmdLineArgs
+  PUBLIC
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${PROJECT_BINARY_DIR}
+)
+
+target_compile_options(cmdLineArgs PRIVATE $<$<CONFIG:Debug>:
+  -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
+  >)
\ No newline at end of file
diff --git a/src/cmdLineArgs.cpp b/external/cmdLineArgs/cmdLineArgs.cpp
similarity index 100%
rename from src/cmdLineArgs.cpp
rename to external/cmdLineArgs/cmdLineArgs.cpp
diff --git a/src/cmdLineArgs.hpp b/external/cmdLineArgs/cmdLineArgs.hpp
similarity index 100%
rename from src/cmdLineArgs.hpp
rename to external/cmdLineArgs/cmdLineArgs.hpp
diff --git a/external/cmdLineArgs/debug.hpp b/external/cmdLineArgs/debug.hpp
new file mode 100644
index 0000000..7f9b235
--- /dev/null
+++ b/external/cmdLineArgs/debug.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <iostream>
+
+#include "config.hpp"
+
+#if enableDebug == 1
+#define debugln(x) std::cout << "\033[32m" << x << std::endl << "\033[0m";
+#define debug(x) std::cout << "\033[32m" << x << "\033[0m";
+#define debugWarn(x) std::cerr << "\033[33m" << x << "\033[0m";
+#define debugWarnln(x) std::cerr << "\033[33m" << x << std::endl << "\033[0m";
+#define debugErrorln(x) std::cerr << "\033[31m" << x << std::endl << "\033[0m";
+#define debugError(x) std::cerr "\033[31m" << x << "\033[0m";
+#else
+#define debugln(x)
+#define debug(x)
+#define debugWarn(x)
+#define debugWarnln(x)
+#define debugErrorln(x)
+#define debugError(x)
+#endif
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 680e698..99472bc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,28 +1,30 @@
-add_executable(main main.cpp cmdLineArgs.cpp)
+add_executable(main main.cpp)
 
 # tell CMake to generate config.hpp
-configure_file (
+configure_file(
   "${PROJECT_SOURCE_DIR}/config.hpp.in"
   "${PROJECT_BINARY_DIR}/config.hpp"
-  )
+)
 
 add_subdirectory(TopTeamBedrijfssimulaties)
-#add_subdirectory(initial)
-#add_subdirectory(io)
-#add_subdirectory(parser)
 
+# add_subdirectory(initial)
+# add_subdirectory(io)
+# add_subdirectory(parser)
 target_link_libraries(main
   PRIVATE
-    TopTeamBedrijfssimulaties
-  )
+  TopTeamBedrijfssimulaties
+  cmdLineArgs
+)
 
-  target_include_directories(TopTeamBedrijfssimulaties
+target_include_directories(TopTeamBedrijfssimulaties
   PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
-    ${PROJECT_BINARY_DIR}
-  )
-  
-  target_compile_options(main PRIVATE $<$<CONFIG:Debug>:
+  ${CMAKE_MAIN_SOURCE_DIR}/external/**
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
+  ${PROJECT_BINARY_DIR}
+)
+
+target_compile_options(main PRIVATE $<$<CONFIG:Debug>:
   -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
   >)
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1500971..59eaca3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,11 +3,6 @@ include_directories(${GTEST_INCLUDE_DIR})
 
 link_directories(${GTEST_LIB_DIR})
 
-set(LIBS
-    ${LIBS}
-    gtest
-    TopTeamBedrijfssimulaties)
-
 # tests
 file(GLOB_RECURSE TEST_SOURCES "*.cpp")
 add_executable(tests ${TEST_SOURCES})
@@ -15,4 +10,18 @@ target_link_libraries(tests ${LIBS})
 
 target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
     -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
-    >)
\ No newline at end of file
+    >)
+target_link_libraries(tests
+    PRIVATE
+    TopTeamBedrijfssimulaties
+    cmdLineArgs
+    gtest
+)
+
+target_include_directories(tests
+    PUBLIC
+    ${CMAKE_MAIN_SOURCE_DIR}/external/**
+    ${CMAKE_CURRENT_LIST_DIR}
+    ${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
+    ${PROJECT_BINARY_DIR}
+)
\ No newline at end of file