Merge branch 'jeffin143-bump-arma'

mlpack · Sep 27, 2019 · ff4a033 · ff4a033
2 parents f24c075 + e922c81
commit ff4a033
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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

diff --git 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