Merge pull request #8494 from JackBoosY/dev/jack/8480

[armadillo]Fix cmake path.
This commit is contained in:
Victor Romero 2019-10-09 11:13:45 -07:00 committed by GitHub
commit 65fd4502ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
Source: armadillo 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 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) Build-Depends: openblas (!osx), clapack (!osx)

View File

@ -27,7 +27,7 @@ vcpkg_configure_cmake(
) )
vcpkg_install_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() vcpkg_copy_pdbs()
@ -41,5 +41,5 @@ if(SHARE_LEN EQUAL 0)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo)
endif() endif()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)