aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <yuzaiyang@beyondsoft.com>2019-10-07 23:59:05 -0700
committerJackBoosY <yuzaiyang@beyondsoft.com>2019-10-07 23:59:54 -0700
commitdf3e90fd27966569f0677cbb91417e297a61c2e9 (patch)
treea276294dc3c0e538c3499b77e0aa07a59c5cbd6c
parent9f26ae8bf0888c8a5b6a92c792859dde044d005f (diff)
downloadvcpkg-df3e90fd27966569f0677cbb91417e297a61c2e9.tar.gz
vcpkg-df3e90fd27966569f0677cbb91417e297a61c2e9.zip
[armadillo]Fix cmake path.
-rw-r--r--ports/armadillo/CONTROL2
-rw-r--r--ports/armadillo/portfile.cmake6
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)