From ba3ef18cb6117c49fcdbf177dce5991d6d679cbc Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Fri, 25 Sep 2020 08:36:44 +0100 Subject: IVGCVSW-5295 Change fmt to be a header-only interface library * Fix non-virtual-dtor warnings in fmt * Fix wrong fmt include in TfParser * Make fmt work in nn-driver * Make fmt a header-only interface library * Link fmt where necessary Signed-off-by: Jan Eilers Change-Id: I9db7cd9a133a81262cbf79f04fb419ab97b88ea8 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 48405327c2..c935e6b52d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -541,10 +541,6 @@ list(APPEND armnn_sources src/profiling/backends/BackendProfiling.cpp src/profiling/backends/BackendProfiling.hpp third-party/cxxopts/cxxopts.hpp - third-party/fmt/core.h - third-party/fmt/format.h - third-party/fmt/format-inl.h - third-party/fmt/src/format.cc third-party/ghc/filesystem.hpp third-party/half/half.hpp ) @@ -587,6 +583,10 @@ if ("${CMAKE_SYSTEM_NAME}" STREQUAL Windows) target_link_libraries(armnn Ws2_32.lib) endif() +# Link fmt third-party library +add_subdirectory(third-party/fmt) +target_link_libraries(armnn fmt) + if(BUILD_CAFFE_PARSER) install(TARGETS armnnCaffeParser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- cgit v1.2.1