diff options
| author | grdowns <grdowns@microsoft.com> | 2019-04-12 02:35:46 -0700 |
|---|---|---|
| committer | grdowns <grdowns@microsoft.com> | 2019-04-12 02:35:46 -0700 |
| commit | 57a8ecec14ade9c09abd2458bc391cfe34735ec7 (patch) | |
| tree | 197a01ce06041571253334564c02786b3c0b85f5 | |
| parent | 8fe6f4bdd83f0b912327693c22e132c0c8f82744 (diff) | |
| parent | fdf36eb8191f46180e34f989dc7251092cf251e9 (diff) | |
| download | vcpkg-57a8ecec14ade9c09abd2458bc391cfe34735ec7.tar.gz vcpkg-57a8ecec14ade9c09abd2458bc391cfe34735ec7.zip | |
Merge branch 'master' of https://github.com/kafeg/vcpkg into dev/grdowns/5525
| -rw-r--r-- | ports/clapack/fix-linux-build.patch | 46 | ||||
| -rw-r--r-- | ports/clapack/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/openblas/portfile.cmake | 8 |
3 files changed, 58 insertions, 3 deletions
diff --git a/ports/clapack/fix-linux-build.patch b/ports/clapack/fix-linux-build.patch new file mode 100644 index 000000000..230fa9bf6 --- /dev/null +++ b/ports/clapack/fix-linux-build.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c53def..9e0e398 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,10 +1,10 @@ + cmake_minimum_required(VERSION 2.6) + project(CLAPACK C) +-enable_testing() ++#enable_testing() + include(CTest) + + # BLAS_LIBRARIES +-find_package(BLAS REQUIRED) ++find_package(OpenBLAS REQUIRED) + + if(WIN32 AND NOT CYGWIN) + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) +@@ -14,7 +14,7 @@ else() + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) + set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) + endif() +-enable_testing() ++#enable_testing() + option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) + if(NOT USE_BLAS_WRAP) + # _zrotg_ seems to be missing in the wrap header +@@ -25,7 +25,7 @@ add_subdirectory(F2CLIBS) + + # add_subdirectory(BLAS) + add_subdirectory(SRC) +-add_subdirectory(TESTING) ++#add_subdirectory(TESTING) + set(CLAPACK_VERSION 3.2.1) + set(CPACK_PACKAGE_VERSION_MAJOR 3) + set(CPACK_PACKAGE_VERSION_MINOR 2) +@@ -38,6 +38,6 @@ include(CPack) + # ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) + + install(FILES +- ${CMAKE_CURRENT_LIST_DIR}/include/clapack.h +- ${CMAKE_CURRENT_LIST_DIR}/include/f2c.h +- DESTINATION include) +\ No newline at end of file ++ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h ++ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h ++ DESTINATION include) diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 9e67594f9..ec0eee40a 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -34,6 +34,13 @@ vcpkg_apply_patches( fix-lack-library.patch ) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch" + ) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 8ea8665e9..665f7024d 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -16,9 +16,11 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") message(FATAL_ERROR "openblas can only be built for x64 currently") endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message("openblas currenly only supports dynamic library linkage") - set(VCPKG_LIBRARY_LINKAGE "dynamic") +if(MSVC) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message("openblas currenly only supports dynamic library linkage") + set(VCPKG_LIBRARY_LINKAGE "dynamic") + endif() endif() vcpkg_from_github( |