From 4ee463b43ab01366a45e8e524c0bee5d905278b1 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sun, 30 Sep 2018 18:58:10 -0400
Subject: [PATCH] fmt library added differently
---
CMakeLists.txt | 4 +++-
externals/CMakeLists.txt | 11 ++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d78b1952..2b82162e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include(DuneMacros)
# start a dune project with information from dune.module
dune_project()
-dune_enable_all_packages(MODULE_LIBRARIES amdis)
+dune_enable_all_packages(MODULE_LIBRARIES amdis fmt)
add_subdirectory("src")
add_subdirectory("test")
@@ -21,5 +21,7 @@ add_subdirectory("doc")
add_subdirectory("cmake/modules")
add_subdirectory("externals")
+target_link_libraries(amdis fmt)
+
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 45866647..82bc47e4 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,9 +1,10 @@
-target_include_directories(amdis PUBLIC
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/fmt/include>)
-
-dune_library_add_sources(amdis SOURCES
+dune_library_add_sources(fmt SOURCES
fmt/src/format.cc
- fmt/src/posix.cc)
+ fmt/src/posix.cc
+)
+
+target_include_directories(fmt PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/fmt/include>)
install(FILES
fmt/include/fmt/core.h
--
GitLab