diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f672e2287949845463f3b2d1a34ad1f90cbc383..b200f8f936316028b52b0533e12bc6f1cec329f9 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 7ddba04bcecae15411f5f5ceb50c0ec246c3d772..6a99688f948b2ca04ad6fa7b9227e56d7388cb79 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)