diff options
| author | Curtis.Bezault <curtbezault@gmail.com> | 2019-07-23 15:29:49 -0700 |
|---|---|---|
| committer | Curtis.Bezault <curtbezault@gmail.com> | 2019-07-23 15:29:49 -0700 |
| commit | 62ec13ba36146f01bfaccbfd5ad22141d6cb061b (patch) | |
| tree | be0099257bca99ea991b599acaa5afb541ce1fd0 /ports/mlpack | |
| parent | 2f2a45595fa925edeace250b694d70095c42b5fa (diff) | |
| parent | 3b808a48ce2fafab82bd7b53642a11a08b21c481 (diff) | |
| download | vcpkg-62ec13ba36146f01bfaccbfd5ad22141d6cb061b.tar.gz vcpkg-62ec13ba36146f01bfaccbfd5ad22141d6cb061b.zip | |
Merge build.cpp
Diffstat (limited to 'ports/mlpack')
| -rw-r--r-- | ports/mlpack/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mlpack/blas_lapack.patch | 13 | ||||
| -rw-r--r-- | ports/mlpack/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL index 0902ce894..e76327ca5 100644 --- a/ports/mlpack/CONTROL +++ b/ports/mlpack/CONTROL @@ -1,5 +1,5 @@ Source: mlpack -Version: 3.1.1 +Version: 3.1.1-1 Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms. Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen diff --git a/ports/mlpack/blas_lapack.patch b/ports/mlpack/blas_lapack.patch new file mode 100644 index 000000000..2b9e44597 --- /dev/null +++ b/ports/mlpack/blas_lapack.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b158498..50f1def 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -286,7 +286,7 @@ if (WIN32)
+ find_package(LAPACK)
+ find_package(BLAS)
+ set(ARMADILLO_LIBRARIES
+- ${ARMADILLO_LIBRARIES} ${BLAS_LIBRARY} ${LAPACK_LIBRARY})
++ ${ARMADILLO_LIBRARIES} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endif ()
+
+ # Include directories for the previous dependencies.
diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 0a5bcb6d1..6bde064f4 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES cmakelists.patch + blas_lapack.patch ) file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake) |