diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-07-19 01:13:10 +0200 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-07-18 16:13:10 -0700 |
| commit | db807ad49f9601ca046f1363b2c388220029e838 (patch) | |
| tree | 15e28c395406f1046ba9c83e067453137176782f /ports/mlpack | |
| parent | 2af0f3f85382296d47d796b28351141035f58ecb (diff) | |
| download | vcpkg-db807ad49f9601ca046f1363b2c388220029e838.tar.gz vcpkg-db807ad49f9601ca046f1363b2c388220029e838.zip | |
[openblas/clapack] FindLapack/FindBLAS was not working. (#6786)
* [clapack] FindLapack was not working for VS Generators
due to extra ascii symbol "%3b" in linker dependencies which is ";"
(Lists in IMPORTED_LOCATION do not work as expected)
This commit is based on CMakes FindLAPACK and adds f2c to be checked
* added include(SelectLibraryConfigurations)
* [clapack] remove openblas patch
* [openblas] add trailing _ on linux
* [openblas] add find wrapper
* [clapack] fix FindLapack
* bump control to retrigger full CI build
* [openblas] enable ninja
* [mlpack] fix libary names for linkage.
* bump control
* Delete enable_openblas_compatibility.patch
* Delete fix_underscore.patch
* Update portfile.cmake
* correct control version bump
* fix control version bump
* bump control
* remove comments
* remove lines in patch file
* remove comment
* remove unused var
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) |