aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-03-21 01:56:25 +0800
committerPhil Christensen <philc@microsoft.com>2019-03-20 10:56:25 -0700
commit64fc3202f557cdba7befd561d8ddb1bd83609606 (patch)
treed638a7da22f20d273274eb5dd2d8fb44fafdf217
parent6f0594756e2dcd8a66422073d9b0e2e4bbc1ed03 (diff)
downloadvcpkg-64fc3202f557cdba7befd561d8ddb1bd83609606.tar.gz
vcpkg-64fc3202f557cdba7befd561d8ddb1bd83609606.zip
[clapack]fix missing library and tools. (#5749)
-rw-r--r--ports/clapack/CONTROL2
-rw-r--r--ports/clapack/fix-lack-library.patch19
-rw-r--r--ports/clapack/portfile.cmake4
3 files changed, 23 insertions, 2 deletions
diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
index 503ddbac5..c30f5eb95 100644
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@@ -1,4 +1,4 @@
Source: clapack
-Version: 3.2.1-1
+Version: 3.2.1-2
Description: CLAPACK (f2c'ed version of LAPACK)
Build-Depends: openblas
diff --git a/ports/clapack/fix-lack-library.patch b/ports/clapack/fix-lack-library.patch
new file mode 100644
index 000000000..f586c04c5
--- /dev/null
+++ b/ports/clapack/fix-lack-library.patch
@@ -0,0 +1,19 @@
+diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt
+index 2bdbd05..e77b3a3 100644
+--- a/F2CLIBS/libf2c/CMakeLists.txt
++++ b/F2CLIBS/libf2c/CMakeLists.txt
+@@ -60,3 +60,13 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
+ include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
+ add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
+ set_property(TARGET f2c PROPERTY PREFIX lib)
++
++install(TARGETS f2c
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
++
++install(TARGETS arithchk
++ RUNTIME DESTINATION tools
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
+\ No newline at end of file
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 933294419..9e67594f9 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -29,7 +29,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/lapack.def DESTINATION ${SOURCE_PATH}/SRC)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-other-blas-and-install-include.patch"
+ PATCHES
+ use-other-blas-and-install-include.patch
+ fix-lack-library.patch
)
vcpkg_configure_cmake(