Skip to content
Snippets Groups Projects
Commit 29194aeb authored by Martin Beseda's avatar Martin Beseda
Browse files

FIX: Removed unneccessary dependencies.

parent b6c8a32d
No related branches found
No related tags found
No related merge requests found
...@@ -10,18 +10,18 @@ FIND_PATH( ...@@ -10,18 +10,18 @@ FIND_PATH(
HINTS HINTS
$ENV{ARMADILLO_INCLUDE_DIR} $ENV{ARMADILLO_INCLUDE_DIR}
${ARMADILLO_INCLUDE_DIR} ${ARMADILLO_INCLUDE_DIR}
external_dependencies/armadillo/ ${ROOT_DIR}/external_dependencies/armadillo/
PATHS PATHS
/usr /usr
/usr/local
/home /home
/opt/local /opt
PATH_SUFFIXES PATH_SUFFIXES
include include
armadillo armadillo
include/armadillo include/armadillo
local
) )
# Is Armadillo downloaded locally? # Is Armadillo downloaded locally?
...@@ -41,7 +41,6 @@ if(LOCAL) ...@@ -41,7 +41,6 @@ if(LOCAL)
armadillo armadillo
"Armadillo was NOT found!" "Armadillo was NOT found!"
ARMADILLO_INCLUDE_DIR) ARMADILLO_INCLUDE_DIR)
else() else()
# Find library # Find library
set(LIBNAME ${LIB_PREFIX}armadillo.so) set(LIBNAME ${LIB_PREFIX}armadillo.so)
...@@ -55,8 +54,11 @@ else() ...@@ -55,8 +54,11 @@ else()
external_dependencies/armadillo external_dependencies/armadillo
PATHS PATHS
/usr/lib /usr
/usr/local/lib /usr/local
PATH_SUFFIXES
lib
) )
# Set ARMADILLO_FOUND honoring the QUIET and REQUIRED arguments # Set ARMADILLO_FOUND honoring the QUIET and REQUIRED arguments
......
...@@ -118,7 +118,6 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -118,7 +118,6 @@ if ("${BUILD_LIB}" STREQUAL "yes")
PRIVATE PRIVATE
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${EXPRTK_INCLUDE_DIRECTORY}
) )
endif () endif ()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment