From b3e253e6dc837679fd404c942909770c4a6b98d2 Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Mon, 4 Mar 2019 20:57:32 +0300 Subject: [clapack] Fix linux build --- ports/clapack/fix-linux-build.patch | 46 +++++++++++++++++++++++++++++++++++++ ports/clapack/portfile.cmake | 7 ++++++ 2 files changed, 53 insertions(+) create mode 100644 ports/clapack/fix-linux-build.patch 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 933294419..fb4b93c55 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -32,6 +32,13 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-other-blas-and-install-include.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} -- cgit v1.2.3 From d4e25169c15270bbca21de7ae910d083d81f105f Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Mon, 4 Mar 2019 22:29:51 +0300 Subject: [openblas] Remove restriction of build static lib on Linux --- ports/openblas/portfile.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index ef4e5e177..e7c9ead8a 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(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message("openblas currenly only supports dynamic library linkage") + set(VCPKG_LIBRARY_LINKAGE "dynamic") + endif() endif() vcpkg_from_github( -- cgit v1.2.3 From fdf36eb8191f46180e34f989dc7251092cf251e9 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Wed, 6 Mar 2019 15:20:03 +0300 Subject: Update ports/openblas/portfile.cmake Co-Authored-By: kafeg --- ports/openblas/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index e7c9ead8a..9aa269c90 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -16,7 +16,7 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") message(FATAL_ERROR "openblas can only be built for x64 currently") endif() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(MSVC) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") message("openblas currenly only supports dynamic library linkage") set(VCPKG_LIBRARY_LINKAGE "dynamic") -- cgit v1.2.3