From 7f9515600a27a933c71466b4d027f5d44bdfa9d5 Mon Sep 17 00:00:00 2001 From: jeffinsam Date: Tue, 24 Sep 2019 16:36:19 +0530 Subject: [PATCH 1/2] change arma version in Cmake git add ../CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c60590cf8e..03969ec63e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,7 +238,7 @@ endif() # ENSMALLEN_INCLUDE_DIR - include directory for ensmallen # MATHJAX_ROOT - root of MathJax installation -find_package(Armadillo 6.500.0 REQUIRED) +find_package(Armadillo 8.400.0 REQUIRED) # If Armadillo was compiled without ARMA_64BIT_WORD and we are on a 64-bit # system (where size_t will be 64 bits), suggest to the user that they should From e922c81106eea5bba1168cd7f5ba3bd6710f73c8 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Fri, 27 Sep 2019 13:37:44 -0400 Subject: [PATCH 2/2] Update history. --- HISTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.md b/HISTORY.md index d18db477d2..be8006e52a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,6 @@ ### mlpack ?.?.? ###### ????-??-?? + * Fix CMake check for Armadillo version (#2029). ### mlpack 3.2.0 ###### 2019-09-25