diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-09 11:13:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 11:13:45 -0700 |
| commit | 65fd4502aefa228aff2e40a3feb1b717e86b1e39 (patch) | |
| tree | bd89e43a7a6f424a07b647130ef66c9db68595e1 | |
| parent | 31458d8ff699236a250490739312119ca85d3114 (diff) | |
| parent | df3e90fd27966569f0677cbb91417e297a61c2e9 (diff) | |
| download | vcpkg-65fd4502aefa228aff2e40a3feb1b717e86b1e39.tar.gz vcpkg-65fd4502aefa228aff2e40a3feb1b717e86b1e39.zip | |
Merge pull request #8494 from JackBoosY/dev/jack/8480
[armadillo]Fix cmake path.
| -rw-r--r-- | ports/armadillo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/armadillo/portfile.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index 4a0257753..41b52bea7 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,4 +1,4 @@ Source: armadillo -Version: 2019-04-16-5 +Version: 2019-04-16-6 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 7a9d73fe4..512aa813e 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -27,7 +27,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/Armadillo) vcpkg_copy_pdbs() @@ -41,5 +41,5 @@ if(SHARE_LEN EQUAL 0) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |