From b736ba5787827937ac7312dce1c4bec0f09a6147 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sun, 31 Mar 2019 13:22:27 +0300
Subject: [PATCH] Attempt to resolve msgpack missing cmake config
---
.gitlab-ci.yml | 3 ++-
CMakeLists.txt | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f672e228..b200f8f93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
image: gcc
before_script:
- - apt-get update -qq && apt-get install -y -qq g++ cmake libopencv-dev libgoogle-glog-dev liburiparser-dev libmsgpack-dev
+ - apt-get update -qq && apt-get install -y -qq g++ cmake
+ - apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libmsgpack-dev
ftl:
script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ddba04bc..6a99688f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
find_package( glog REQUIRED )
find_package( OpenCV REQUIRED )
find_package( Threads REQUIRED )
+find_package( MsgPack )
find_package( LibSGM )
-find_package( Msgpack REQUIRED )
+
+if (NOT MSGPACK_FOUND)
+ check_include_file_cxx("msgpack.hpp" MSGPACK_FOUND)
+ if (NOT MSGPACK_FOUND)
+ message(ERROR "Msgpack is required")
+ endif()
+endif()
include_directories(${PROJECT_SOURCE_DIR}/common/cpp/include)
--
GitLab