Merge branch 'release/0.4.1'

MonoMotion · Feb 3, 2019 · d35bd0c · d35bd0c
2 parents a4348aa + 9875ed7
commit d35bd0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ci/image-scripts/package.sh b/ci/image-scripts/package.sh
@@ -50,4 +50,4 @@ function build_package() {
 }
 
 build_package deb deb ${VERSION} -d "libprotobuf10 (>= 3.0.0) | libprotobuf17 (>= 3.0.0)"
-build_package pacman pkg.tar.xz ${VERSION//[^[:alnum:].]/} -d "protobuf >= 3.0.0"
+build_package pacman pkg.tar.xz ${VERSION//[^[:alnum:].]/} -d "protobuf"
diff --git a/config/flomConfig.cmake.in b/config/flomConfig.cmake.in
@@ -10,9 +10,11 @@ set(flom_DETAILED_VERSION @flom_DETAILED_VERSION@)
 
 find_package (Eigen3 REQUIRED NO_MODULE)
 
-set_and_check(flom_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@ ${EIGEN3_INCLUDE_DIR}")
+set_and_check(flom_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set_and_check(flom_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
 
+list(APPEND flom_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
+
 set(flom_LIBRARIES flom)
 
 check_required_components(flom)