From 50efaebbae2f211df29e1f35e9ad99b2d73445ac Mon Sep 17 00:00:00 2001 From: James Rowe Date: Tue, 14 Mar 2017 23:35:48 -0600 Subject: [PATCH] Add spdlog as a dependency --- .gitmodules | 3 +++ externals/CMakeLists.txt | 4 ++++ externals/spdlog | 1 + src/common/CMakeLists.txt | 4 +++- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 160000 externals/spdlog diff --git a/.gitmodules b/.gitmodules index 36caa59f8..ba3749031 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "fmt"] path = externals/fmt url = https://github.com/fmtlib/fmt.git +[submodule "spdlog"] + path = externals/spdlog + url = https://github.com/gabime/spdlog.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 02e02350c..fdf15518c 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -48,3 +48,7 @@ if (ARCHITECTURE_x86_64) target_include_directories(xbyak INTERFACE ./xbyak/xbyak) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) endif() + +# Spdlog +add_library(spdlog INTERFACE) +target_include_directories(spdlog INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/spdlog/include) diff --git a/externals/spdlog b/externals/spdlog new file mode 160000 index 000000000..f85a08622 --- /dev/null +++ b/externals/spdlog @@ -0,0 +1 @@ +Subproject commit f85a08622e20b74bff34381cafcb8ef8167b29d0 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7e83e64b0..c229aceec 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -95,7 +95,9 @@ endif() create_directory_groups(${SRCS} ${HEADERS}) add_library(common STATIC ${SRCS} ${HEADERS}) -target_link_libraries(common PUBLIC Boost::boost microprofile) + +target_link_libraries(common PUBLIC Boost::boost microprofile spdlog) + if (ARCHITECTURE_x86_64) target_link_libraries(common PRIVATE xbyak) endif()