Skip to content
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

[clapack, lapack-reference] Add conflict messages #13200

Merged
merged 10 commits into from
Sep 1, 2020
Merged

[clapack, lapack-reference] Add conflict messages #13200

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4c3c568
[clapack, lapack-reference] Add conflict messages
Aug 28, 2020
b164b90
Update ports/clapack/portfile.cmake
NancyLi1013 Aug 28, 2020
2ec7bf9
Update ports/lapack-reference/portfile.cmake
NancyLi1013 Aug 28, 2020
d68b537
Update ports/lapack-reference/portfile.cmake
NancyLi1013 Aug 28, 2020
2ffe7c5
Update ports/lapack-reference/portfile.cmake
JackBoosY Aug 31, 2020
8a84c2e
Update ports/clapack/portfile.cmake
JackBoosY Aug 31, 2020
0086a54
Merge remote-tracking branch 'origin/master' into pr/NancyLi1013/13200
BillyONeal Aug 31, 2020
f9239d0
Ensure all clapacks are skipped in ci.baseline.txt.
BillyONeal Aug 31, 2020
723e14f
Add missing terminating quote.
BillyONeal Aug 31, 2020
903c658
Add accidentially removed clblas line back.
BillyONeal Sep 1, 2020
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
2 changes: 1 addition & 1 deletion ports/clapack/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: clapack
Version: 3.2.1
Port-Version: 14
Port-Version: 15
Homepage: https://www.netlib.org/clapack
Description: CLAPACK (f2c'ed version of LAPACK)
Build-Depends: openblas (!osx)
4 changes: 4 additions & 0 deletions ports/clapack/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/lapack.lib")
message(FATAL_ERROR "Can't build ${PORT} if lapack-reference is installed. Please remove lapack-reference:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
endif()

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_download_distfile(ARCHIVE
Expand Down
2 changes: 1 addition & 1 deletion ports/lapack-reference/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: lapack-reference
Version: 3.8.0
Port-Version: 1
Port-Version: 2
Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/
Default-Features: blas-select
Build-Depends: vcpkg-gfortran (windows)
Expand Down
4 changes: 4 additions & 0 deletions ports/lapack-reference/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
# USE_OPTIMIZED_LAPACK (Probably not what we want. Does a find_package(LAPACK): probably for LAPACKE only builds _> own port?)
# LAPACKE Builds LAPACKE
# LAPACKE_WITH_TMG Build LAPACKE with tmglib routines
if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/lapack.lib")
message(FATAL_ERROR "Can't build ${PORT} if clapack is installed. Please remove clapack:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
endif()

include(vcpkg_find_fortran)
SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

Expand Down