[Armadillo] update to 10.1.0 (#14159)

5 files changed, 39 insertions, 67 deletions

diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
index 850809579..16fad7f70 100644
--- a/ports/armadillo/CONTROL
+++ b/ports/armadillo/CONTROL
@@ -1,5 +1,5 @@
 Source: armadillo
-Version: 2019-04-16
-Port-Version: 10
+Version: 10.1.0
+Homepage: https://gitlab.com/conradsnicta/armadillo-code
 Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
 Build-Depends: openblas, lapack
diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch
index 65197e202..a32628233 100644
--- a/ports/armadillo/add-disable-find-package.patch
+++ b/ports/armadillo/add-disable-find-package.patch
@@ -1,35 +1,3 @@
-diff --git a/cmake_aux/Modules/ARMA_FindACML.cmake b/cmake_aux/Modules/ARMA_FindACML.cmake

-index 7d0655e..fa435ff 100644

---- a/cmake_aux/Modules/ARMA_FindACML.cmake

-+++ b/cmake_aux/Modules/ARMA_FindACML.cmake

-@@ -5,6 +5,11 @@

- # also defined, but not for general use are

- #  ACML_LIBRARY, where to find the ACML library.

- 

-+if(CMAKE_DISABLE_FIND_PACKAGE_ACML)

-+  set(ACML_FOUND "NO")

-+  return()

-+endif()

-+

- SET(ACML_NAMES ${ACML_NAMES} acml)

- FIND_LIBRARY(ACML_LIBRARY

-   NAMES ${ACML_NAMES}

-diff --git a/cmake_aux/Modules/ARMA_FindACMLMP.cmake b/cmake_aux/Modules/ARMA_FindACMLMP.cmake

-index 3390179..ead7b1e 100644

---- a/cmake_aux/Modules/ARMA_FindACMLMP.cmake

-+++ b/cmake_aux/Modules/ARMA_FindACMLMP.cmake

-@@ -5,6 +5,11 @@

- # also defined, but not for general use are

- #  ACMLMP_LIBRARY, where to find the ACMLMP library.

- 

-+if(CMAKE_DISABLE_FIND_PACKAGE_ACMLMP)

-+  set(ACMLMP_FOUND NO)

-+  return()

-+endif()

-+

- SET(ACMLMP_NAMES ${ACMLMP_NAMES} acml_mp)

- FIND_LIBRARY(ACMLMP_LIBRARY

-   NAMES ${ACMLMP_NAMES}

 diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake

 index 1a709ad..3029c25 100644

 --- a/cmake_aux/Modules/ARMA_FindARPACK.cmake

diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch
index 58cca5c64..6d16a26f8 100644
--- a/ports/armadillo/fix-CMakePath.patch
+++ b/ports/armadillo/fix-CMakePath.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fea721..e6a273d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -473,7 +473,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION
- # and install it
- set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
- set(ARMADILLO_LIB_DIR      "${CMAKE_INSTALL_FULL_LIBDIR}")
--set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake")
-+set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo")
- 
- 
- message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'")
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 0fb228f..19cfdf8 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -611,7 +611,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION

+ # and install it

+ set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}")

+ set(ARMADILLO_LIB_DIR      "${CMAKE_INSTALL_FULL_LIBDIR}")

+-set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake")

++set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo")

+ 

+ 

+ message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'")

diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
index 586864495..7ec7bdad0 100644
--- a/ports/armadillo/portfile.cmake
+++ b/ports/armadillo/portfile.cmake
@@ -4,9 +4,9 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO conradsnicta/armadillo-code
-    REF f00d3225b1c005775044369723f31cecc3cd6569
-    SHA512 ca3574edf5de8c752867403c3856ed9569fbed2ce9729585cae59be5751493c2e71121319b0a812e2ea56baada6b6f62fbc84ce6f1efb362347e5fd4141ccf1b
-    HEAD_REF 9.400.x
+    REF 24b4762cbfbd3ad14c99a4854acd3560559a3195    #v 10.1.0
+    SHA512 224a875d21168f80e00604185ef72cb559a86a350a037c9cd1660a6f4dcc68f2ebf6dbc073f234a3cb03d35d959adb44ec49af88b11e3aaca9e0017c9c3fcee6
+    HEAD_REF 10.1.x
     PATCHES
         remove_custom_modules.patch
         fix-CMakePath.patch
diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch
index 0723dbeb5..1ce5984bf 100644
--- a/ports/armadillo/remove_custom_modules.patch
+++ b/ports/armadillo/remove_custom_modules.patch
@@ -1,17 +1,21 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0959127..9fea721 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -176,10 +176,9 @@ else()
-   include(ARMA_FindMKL)
-   include(ARMA_FindACMLMP)
-   include(ARMA_FindACML)
--  include(ARMA_FindOpenBLAS)
-   include(ARMA_FindATLAS)
--  include(ARMA_FindBLAS)
--  include(ARMA_FindLAPACK)
-+  find_package(BLAS)
-+  find_package(LAPACK)
-   
-   message(STATUS "     MKL_FOUND = ${MKL_FOUND}"     )
-   message(STATUS "  ACMLMP_FOUND = ${ACMLMP_FOUND}"  )
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 0fb228f..2275734 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -321,14 +321,13 @@ else()

+   set(ARMA_OS unix)

+   

+   include(ARMA_FindMKL)

+-  include(ARMA_FindOpenBLAS)

+   include(ARMA_FindATLAS)

+-  include(ARMA_FindBLAS)

+-  include(ARMA_FindLAPACK)

+   

+   if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))

+     include(ARMA_FindFlexiBLAS)

+   endif()

++  find_package(BLAS)

++  find_package(LAPACK)  

+   

+   message(STATUS "      MKL_FOUND = ${MKL_FOUND}"       )

+   message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}"  )