sani7/TopTeamBedrijfssimulaties-Starters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move cmdLineArgs lib to external

Browse Source
This commit is contained in:
Sander Speetjens
2022-11-13 19:52:19 +01:00
parent 91d3952ea0
commit 2da39359c6
7 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/CMakeLists.txt vendored
View File

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

15
external/cmdLineArgs/CMakeLists.txt vendored Normal file
View File

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

0
src/cmdLineArgs.cpp → external/cmdLineArgs/cmdLineArgs.cpp vendored
View File

0
src/cmdLineArgs.hpp → external/cmdLineArgs/cmdLineArgs.hpp vendored
View File

21
external/cmdLineArgs/debug.hpp vendored Normal file
View File

@@ -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

32
src/CMakeLists.txt
View File

@@ -1,28 +1,30 @@
add_executable(main main.cpp cmdLineArgs.cpp) add_executable(main main.cpp)
# tell CMake to generate config.hpp # tell CMake to generate config.hpp
configure_file ( configure_file(
"${PROJECT_SOURCE_DIR}/config.hpp.in" "${PROJECT_SOURCE_DIR}/config.hpp.in"
"${PROJECT_BINARY_DIR}/config.hpp" "${PROJECT_BINARY_DIR}/config.hpp"
) )
add_subdirectory(TopTeamBedrijfssimulaties) 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 target_link_libraries(main
PRIVATE PRIVATE
TopTeamBedrijfssimulaties TopTeamBedrijfssimulaties
) cmdLineArgs
)
target_include_directories(TopTeamBedrijfssimulaties target_include_directories(TopTeamBedrijfssimulaties
PUBLIC PUBLIC
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MAIN_SOURCE_DIR}/external/**
${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties ${CMAKE_CURRENT_LIST_DIR}
${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
) ${PROJECT_BINARY_DIR}
)
target_compile_options(main PRIVATE $<$<CONFIG:Debug>:
target_compile_options(main PRIVATE $<$<CONFIG:Debug>:
-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
>) >)

21
tests/CMakeLists.txt
View File

@@ -3,11 +3,6 @@ include_directories(${GTEST_INCLUDE_DIR})
link_directories(${GTEST_LIB_DIR}) link_directories(${GTEST_LIB_DIR})
set(LIBS
${LIBS}
gtest
TopTeamBedrijfssimulaties)
# tests # tests
file(GLOB_RECURSE TEST_SOURCES "*.cpp") file(GLOB_RECURSE TEST_SOURCES "*.cpp")
add_executable(tests ${TEST_SOURCES}) add_executable(tests ${TEST_SOURCES})
@@ -15,4 +10,18 @@ target_link_libraries(tests ${LIBS})
target_compile_options(tests PRIVATE $<$<CONFIG:Debug>: target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion -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}
)