From 29194aebc1d445c89a3f1550b57795f4075234da Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Thu, 21 Feb 2019 00:55:06 +0100
Subject: [PATCH] FIX: Removed unneccessary dependencies.
---
FindArmadillo.cmake | 14 ++++++++------
src/CMakeLists.txt | 1 -
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/FindArmadillo.cmake b/FindArmadillo.cmake
index 972fa73d..106ec09e 100644
--- a/FindArmadillo.cmake
+++ b/FindArmadillo.cmake
@@ -10,18 +10,18 @@ FIND_PATH(
HINTS
$ENV{ARMADILLO_INCLUDE_DIR}
${ARMADILLO_INCLUDE_DIR}
- external_dependencies/armadillo/
+ ${ROOT_DIR}/external_dependencies/armadillo/
PATHS
/usr
- /usr/local
/home
- /opt/local
+ /opt
PATH_SUFFIXES
include
armadillo
include/armadillo
+ local
)
# Is Armadillo downloaded locally?
@@ -41,7 +41,6 @@ if(LOCAL)
armadillo
"Armadillo was NOT found!"
ARMADILLO_INCLUDE_DIR)
-
else()
# Find library
set(LIBNAME ${LIB_PREFIX}armadillo.so)
@@ -55,8 +54,11 @@ else()
external_dependencies/armadillo
PATHS
- /usr/lib
- /usr/local/lib
+ /usr
+ /usr/local
+
+ PATH_SUFFIXES
+ lib
)
# Set ARMADILLO_FOUND honoring the QUIET and REQUIRED arguments
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc29c721..a2389672 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,7 +118,6 @@ if ("${BUILD_LIB}" STREQUAL "yes")
PRIVATE
${Boost_INCLUDE_DIRS}
- ${EXPRTK_INCLUDE_DIRECTORY}
)
endif ()
--
GitLab