From fc37d107e0580a3afc90e43b8ad219caed456743 Mon Sep 17 00:00:00 2001 From: Pcornat Date: Thu, 29 Feb 2024 12:13:43 +0100 Subject: [PATCH] Adding svector --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 627f40e..35d1f50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,8 @@ else () message(STATUS "ccache not found") endif () +add_subdirectory(external/svector) + option(BUILD_SHARED_LIBS "Build shared libraries" OFF) option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF) option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF) @@ -104,7 +106,7 @@ add_executable(BillySheet ${SOURCES}) target_include_directories(BillySheet PRIVATE include include/imgui external/ImFileDialog) -set_target_properties(BillySheet spdlog PROPERTIES +set_target_properties(BillySheet spdlog svector PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF @@ -112,7 +114,7 @@ set_target_properties(BillySheet spdlog PROPERTIES # UNITY_BUILD ON ) -set_target_properties(spdlog PROPERTIES UNITY_BUILD ON) +set_target_properties(spdlog svector PROPERTIES UNITY_BUILD ON) set_target_properties(glfw PROPERTIES C_STANDARD 11 @@ -130,20 +132,25 @@ target_compile_definitions(BillySheet PRIVATE $<$:SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_ERROR>) target_compile_definitions(spdlog PRIVATE $<$:_GLIBCXX_DEBUG>) +target_compile_definitions(svector INTERFACE $<$:_GLIBCXX_DEBUG>) target_compile_definitions(glfw PRIVATE $<$:_GLIBCXX_DEBUG>) target_compile_options(spdlog PRIVATE ${COMPILE_FLAGS}) +target_compile_options(svector INTERFACE ${COMPILE_FLAGS}) target_compile_options(glfw PRIVATE ${COMPILE_FLAGS}) target_compile_options(BillySheet PRIVATE ${COMPILE_FLAGS}) target_link_options(spdlog PRIVATE ${LINKER_OPTIONS}) +target_link_options(svector INTERFACE ${LINKER_OPTIONS}) target_link_options(glfw PRIVATE ${LINKER_OPTIONS}) target_link_options(BillySheet PRIVATE ${LINKER_OPTIONS}) target_link_libraries(spdlog PRIVATE ${LINKER_FLAGS}) +target_link_libraries(svector INTERFACE ${LINKER_FLAGS}) target_link_libraries(glfw PRIVATE ${LINKER_FLAGS}) target_link_libraries(BillySheet glfw spdlog::spdlog_header_only + svector::svector OpenGL::OpenGL GLEW::GLEW nlohmann_json::nlohmann_json