From 4567fe71d47629d98d6a6ce799c7864c39fd4986 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sun, 26 Jul 2020 14:14:57 +0300
Subject: [PATCH] Add msgpack option to pch first
---
components/common/cpp/include/ftl/utility/msgpack.hpp | 8 ++++----
components/structures/CMakeLists.txt | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/components/common/cpp/include/ftl/utility/msgpack.hpp b/components/common/cpp/include/ftl/utility/msgpack.hpp
index a7b6d4621..3e13df144 100644
--- a/components/common/cpp/include/ftl/utility/msgpack.hpp
+++ b/components/common/cpp/include/ftl/utility/msgpack.hpp
@@ -1,14 +1,14 @@
#ifndef _FTL_MSGPACK_HPP_
#define _FTL_MSGPACK_HPP_
-#include <msgpack.hpp>
-#include <opencv2/core/mat.hpp>
-#include <Eigen/Eigen>
-
#ifdef _MSC_VER
#include "msgpack_optional.hpp"
#endif
+#include <msgpack.hpp>
+#include <opencv2/core/mat.hpp>
+#include <Eigen/Eigen>
+
namespace msgpack {
MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
namespace adaptor {
diff --git a/components/structures/CMakeLists.txt b/components/structures/CMakeLists.txt
index c291ee7e2..c389b1e5c 100644
--- a/components/structures/CMakeLists.txt
+++ b/components/structures/CMakeLists.txt
@@ -7,6 +7,7 @@ target_include_directories(ftldata PUBLIC
target_link_libraries(ftldata ftlcommon Eigen3::Eigen ftlcodecs)
target_precompile_headers(ftldata
+ PRIVATE ../common/cpp/include/ftl/utility/msgpack_optional.hpp
PRIVATE ../common/cpp/include/ftl/cuda_common.hpp
PRIVATE ../common/cpp/include/loguru.hpp
PRIVATE include/ftl/data/new_frame.hpp
--
GitLab