From 5c0041a0cac70f8ba8c541275b9d0e74a7784a0a Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Sun, 3 Feb 2019 09:43:54 +0000 Subject: [PATCH 1/2] Fix: Fix invalid dependency notation in pacman package --- ci/image-scripts/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/image-scripts/package.sh b/ci/image-scripts/package.sh index f108a0b..9e7920c 100755 --- 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" From c2636d7e178871547c72373b0cf3677dfb539b46 Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Sun, 3 Feb 2019 10:06:49 +0000 Subject: [PATCH 2/2] Fix: Append Eigen include path later to avoid failure of set_and_check --- config/flomConfig.cmake.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/flomConfig.cmake.in b/config/flomConfig.cmake.in index f461e64..c45f8e1 100644 --- 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)