Skip to content

[armadillo]Fix usage error. #6474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JackBoosY wants to merge 2 commits into from
Closed

[armadillo]Fix usage error. #6474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03db202
[armadillo]Add dependent port openblas and add vcpkg_configure_cmake …
May 16, 2019
7f11d43
[armadillo]re-fix usage error.
May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/armadillo/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Source: armadillo
Version: 2019-04-16-f00d3225
Version: 2019-04-16-f00d3225-1
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
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
12 changes: 11 additions & 1 deletion ports/armadillo/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,21 @@ vcpkg_from_gitlab(
HEAD_REF 9.400.x
)

if (WIN32)
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
set(LIBRARY_SUFFIX ".lib")
elseif (UNIX)
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
set(LIBRARY_SUFFIX ".a")
else()
message(FATAL_ERROR "Unsupport platform: ${VCPKG_CMAKE_SYSTEM_NAME}")
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DDETECT_HDF5=false
-DBLAS_LIBRARY:FILEPATH=${CURRENT_INSTALLED_DIR}/lib/openblas${LIBRARY_SUFFIX}
-DLAPACK_LIBRARY:FILEPATH=${CURRENT_INSTALLED_DIR}/lib/openblas${LIBRARY_SUFFIX}
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
)

vcpkg_install_cmake()
Expand All @@ -26,4 +36,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

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/armadillo RENAME copyright)