OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-26 14:10:05 +00:00
Code Issues Projects Releases Wiki Activity

Add spdlog as a dependency

Browse Source
This commit is contained in:
James Rowe 2017-03-14 23:35:48 -06:00
parent 72b69cea4b
commit 50efaebbae
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -25,3 +25,6 @@
[submodule "fmt"] [submodule "fmt"]
path = externals/fmt path = externals/fmt
url = https://github.com/fmtlib/fmt.git url = https://github.com/fmtlib/fmt.git
[submodule "spdlog"]
path = externals/spdlog
url = https://github.com/gabime/spdlog.git

4
externals/CMakeLists.txt vendored
View File

@ -48,3 +48,7 @@ if (ARCHITECTURE_x86_64)
target_include_directories(xbyak INTERFACE ./xbyak/xbyak) target_include_directories(xbyak INTERFACE ./xbyak/xbyak)
target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
endif() endif()
# Spdlog
add_library(spdlog INTERFACE)
target_include_directories(spdlog INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/spdlog/include)

1
externals/spdlog vendored Submodule

@ -0,0 +1 @@
Subproject commit f85a08622e20b74bff34381cafcb8ef8167b29d0

4
src/common/CMakeLists.txt
View File

@ -95,7 +95,9 @@ endif()
create_directory_groups(${SRCS} ${HEADERS}) create_directory_groups(${SRCS} ${HEADERS})
add_library(common STATIC ${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) if (ARCHITECTURE_x86_64)
target_link_libraries(common PRIVATE xbyak) target_link_libraries(common PRIVATE xbyak)
endif() endif()