lib: Add fmt library

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
bluerobotics · Dec 10, 2019 · 49f3f34 · 49f3f34
1 parent 9c918cc
commit 49f3f34
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/mavlink/c_library_v2"]
 	path = lib/mavlink/c_library_v2
 	url = https://github.com/mavlink/c_library_v2
+[submodule "lib/fmt/fmt"]
+	path = lib/fmt/fmt
+	url = https://github.com/fmtlib/fmt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,11 +46,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
 
 # global include directories
 include_directories(
+    lib/fmt/fmt/include/
     lib/ping-cpp/ping-cpp/src/message/
     lib/maddy/maddy/include/
     lib/mavlink/c_library_v2/
     lib/mavlink/c_library_v2/minimal
     lib/mavlink/c_library_v2/common
 )
 
+add_subdirectory(lib/fmt/fmt)
+
 add_subdirectory(src)
diff --git a/lib/fmt/fmt b/lib/fmt/fmt
diff --git a/lib/fmt/fmt.pri b/lib/fmt/fmt.pri
@@ -0,0 +1,7 @@
+LIBPATH = $$PWD/fmt/
+
+HEADERS += $$LIBPATH/include/fmt/*.h
+
+SOURCES += $$LIBPATH/src/*.cc
+
+INCLUDEPATH += $$LIBPATH/include/
diff --git a/pingviewer.pro b/pingviewer.pro
@@ -34,6 +34,7 @@ RESOURCES += \
     QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator'"
 }
 
+include(lib/fmt/fmt.pri)
 include(lib/maddy/maddy.pri)
 include(lib/mavlink/mavlink.pri)
 include(lib/ping-cpp/ping-cpp.pri)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,6 +35,6 @@ target_link_libraries(
     Qt5::QuickControls2
     Qt5::Charts
     Qt5::Widgets # QApplication
-
     ${INCLUDE_DIRS}
+    fmt::fmt
 )