Move cmdLineArgs lib to external

external/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(cmdLineArgs)

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
+  >)

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

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_executable(main main.cpp cmdLineArgs.cpp)
+add_executable(main main.cpp)
 
 # tell CMake to generate config.hpp
 configure_file(
@@ -7,17 +7,19 @@ configure_file (
 )
 
 add_subdirectory(TopTeamBedrijfssimulaties)
+
 # add_subdirectory(initial)
 # add_subdirectory(io)
 # add_subdirectory(parser)
-
 target_link_libraries(main
   PRIVATE
   TopTeamBedrijfssimulaties
+  cmdLineArgs
 )
 
 target_include_directories(TopTeamBedrijfssimulaties
   PUBLIC
+  ${CMAKE_MAIN_SOURCE_DIR}/external/**
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
   ${PROJECT_BINARY_DIR}

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})
@@ -16,3 +11,17 @@ target_link_libraries(tests ${LIBS})
 target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
     -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
     >)
+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}
+)