diff options
| author | wangli28 <47812810+wangli28@users.noreply.github.com> | 2019-06-26 01:56:21 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-25 10:56:21 -0700 |
| commit | 6a6d350d49e6a3bee55d7f644b43e57ccfc9f98a (patch) | |
| tree | f20733373ed8d1f9bea67b1f78f68c817d8008b3 | |
| parent | 40a78054f50ed5eb5bf24cd9a522b48b62725f34 (diff) | |
| download | vcpkg-6a6d350d49e6a3bee55d7f644b43e57ccfc9f98a.tar.gz vcpkg-6a6d350d49e6a3bee55d7f644b43e57ccfc9f98a.zip | |
[armadillo] Fix build error in Linux (#7022)
[armadillo] Fix installation path
| -rw-r--r-- | ports/armadillo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/armadillo/portfile.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index 5baafdfdf..78f0a66c3 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,4 +1,4 @@ Source: armadillo -Version: 2019-04-16-2 +Version: 2019-04-16-3 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 (!osx), clapack (!osx) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 437f174dd..143591de6 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -25,11 +25,12 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/armadillo/CMake) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright) |