diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8e84f05e..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "third_party/fmt"] - path = third_party/fmt - url = https://github.com/fmtlib/fmt.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bc8d58c..0664960e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG=DEBUG") include(${PROJECT_SOURCE_DIR}/cmake/dependencies.cmake) add_library(umd_common_directories INTERFACE) -target_include_directories(umd_common_directories INTERFACE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/device ${PROJECT_SOURCE_DIR}/third_party/fmt/include) +target_include_directories(umd_common_directories INTERFACE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/device) add_subdirectory(${PROJECT_SOURCE_DIR}/device) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 50ceacab..74337e83 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -77,6 +77,16 @@ CPMAddPackage( "LIBUV_BUILD_TESTS OFF" ) +############################################################################################################################ +# fmt : https://github.com/fmtlib/fmt +############################################################################################################################ + +CPMAddPackage( + NAME fmt + GITHUB_REPOSITORY fmtlib/fmt + GIT_TAG 11.0.1 +) + if(NOT MASTER_PROJECT) set(nng_include_dir ${nanomsg_SOURCE_DIR}/include PARENT_SCOPE) set(flatbuffers_include_dir ${flatbuffers_SOURCE_DIR}/include PARENT_SCOPE) diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt index c3092142..f8a18b42 100644 --- a/device/CMakeLists.txt +++ b/device/CMakeLists.txt @@ -18,7 +18,7 @@ set(UMD_DEVICE_SRCS add_library(umd_device SHARED ${UMD_DEVICE_SRCS}) target_link_libraries(umd_device PUBLIC yaml-cpp::yaml-cpp umd_common_directories nng uv compiler_flags - PRIVATE hwloc rt Boost::interprocess + PRIVATE hwloc rt Boost::interprocess fmt ) target_include_directories(umd_device PUBLIC ${flatbuffers_SOURCE_DIR}/include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4fdf949d..6c4a09f5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,7 +23,7 @@ elseif($ENV{ARCH_NAME} STREQUAL "blackhole") endif() add_library(test_common INTERFACE) -target_link_libraries(test_common INTERFACE umd_device gtest_main gtest pthread) +target_link_libraries(test_common INTERFACE umd_device gtest_main gtest pthread fmt) target_include_directories(test_common INTERFACE ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/third_party/fmt b/third_party/fmt deleted file mode 160000 index b50e685d..00000000 --- a/third_party/fmt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b50e685db996c167e6c831dcef582aba6e14276a