Merge branch 'master' into cmake-fix

2019-09-28 12:30:49 +02:00
parent c7d1ff4644 ff4a0332af
commit fe1e8d429d
2 changed files with 3 additions and 1 deletions
@@ -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
@@ -2,6 +2,8 @@
 ###### ????-??-??
  * Enforce CMake version check for ensmallen (#2032).

+  * Fix CMake check for Armadillo version (#2029).
+
 ### mlpack 3.2.0
 ###### 2019-09-25
  * Fix occasionally-failing RADICAL test (#1924).