Merge master

2 files changed, 92 insertions, 79 deletions

diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL
index 84263e1e8..43621f9fe 100644
--- a/ports/suitesparse/CONTROL
+++ b/ports/suitesparse/CONTROL
@@ -1,8 +1,8 @@
-Source: suitesparse

-Version: 5.1.2

-Build-Depends: clapack

-Description: algebra library

-

-Feature: metis

-Build-Depends: metis

-Description: Use metis in SuiteSparse

+Source: suitesparse
+Version: 5.1.2-2
+Build-Depends: clapack (!osx)
+Description: algebra library
+
+Feature: metis
+Build-Depends: metis
+Description: Use metis in SuiteSparse
diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake
index ac479c6cc..45ad7a6e5 100644
--- a/ports/suitesparse/portfile.cmake
+++ b/ports/suitesparse/portfile.cmake
@@ -1,71 +1,84 @@
-include(vcpkg_common_functions)

-

-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")

-    set(VCPKG_LIBRARY_LINKAGE static)

-endif()

-

-set(SUITESPARSE_VER SuiteSparse-5.1.2)  #if you change the version, becarefull of changing the SHA512 checksum accordingly

-set(SUITESPARSEWIN_VER 1.4.0)

-set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-${SUITESPARSEWIN_VER})

-set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/Suitesparse)

-

-#download suitesparse libary

-vcpkg_download_distfile(SUITESPARSE

-    URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz"

-    FILENAME "${SUITESPARSE_VER}.tar.gz"

-    SHA512 38c7f9847cf161390f73de39ed3d9fd07f7bcec2d6d4e6f141af6a015826215843db9f2e16ca255eeb233c593ffc19ffa04816aa5b6ba200b55b9472ac33ba85

-)

-

-#download suitesparse-metis-for-windows scripts, suitesparse does not have CMake build system, jlblancoc has made one for it

-vcpkg_download_distfile(SUITESPARSEWIN

-    URLS  "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v${SUITESPARSEWIN_VER}.zip"

-    FILENAME "suitesparse-metis-for-windows-${SUITESPARSEWIN_VER}.zip"

-    SHA512 2859d534200ab9b76fca1530eae5de2f9328aa867c727dbc83a96c6f16e1f87e70123fb2decbb84531d75dac58b6f0ce7323e48c57aeede324fd9a1f77ba74c6

-)

-

-#extract suitesparse-metis-for-windows first and merge with suitesparse library

-vcpkg_extract_source_archive(${SUITESPARSEWIN})

-vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH})

-

-vcpkg_apply_patches(

-    SOURCE_PATH ${SUITESPARSEWIN_PATH}

-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-suitesparse.patch"

-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove-debug-postfix.patch"

-)

-

-set(USE_VCPKG_METIS OFF)

-if("metis" IN_LIST FEATURES)

-    set(USE_VCPKG_METIS ON)

-endif()

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SUITESPARSEWIN_PATH}

-    PREFER_NINJA

-    OPTIONS

-        -DBUILD_METIS=OFF #Disable the option to build metis from source

-        -DUSE_VCPKG_METIS=${USE_VCPKG_METIS} #Force using vcpckg metis library

-        -DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}

-        -DLIB_POSTFIX=

-        -DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON

-        -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/openblas.lib

-        -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/lapack.lib

-     OPTIONS_DEBUG

-        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug

-     OPTIONS_RELEASE

-        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}

-)

-

-vcpkg_install_cmake()

-

-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")

-

-#clean folders

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-

-# Handle copyright of suitesparse and suitesparse-metis-for-windows

-file(COPY ${SUITESPARSE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright)

-

-file(COPY ${SUITESPARSEWIN_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright_suitesparse-metis-for-windows)

+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(SUITESPARSE_VER SuiteSparse-5.1.2)  #if you change the version, becarefull of changing the SHA512 checksum accordingly
+set(SUITESPARSEWIN_VER 1.4.0)
+set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-${SUITESPARSEWIN_VER})
+set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/SuiteSparse)
+
+#download suitesparse libary
+vcpkg_download_distfile(SUITESPARSE
+    URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz"
+    FILENAME "${SUITESPARSE_VER}.tar.gz"
+    SHA512 38c7f9847cf161390f73de39ed3d9fd07f7bcec2d6d4e6f141af6a015826215843db9f2e16ca255eeb233c593ffc19ffa04816aa5b6ba200b55b9472ac33ba85
+)
+
+#download suitesparse-metis-for-windows scripts, suitesparse does not have CMake build system, jlblancoc has made one for it
+vcpkg_download_distfile(SUITESPARSEWIN
+    URLS  "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v${SUITESPARSEWIN_VER}.zip"
+    FILENAME "suitesparse-metis-for-windows-${SUITESPARSEWIN_VER}.zip"
+    SHA512 2859d534200ab9b76fca1530eae5de2f9328aa867c727dbc83a96c6f16e1f87e70123fb2decbb84531d75dac58b6f0ce7323e48c57aeede324fd9a1f77ba74c6
+)
+
+#extract suitesparse-metis-for-windows first and merge with suitesparse library
+vcpkg_extract_source_archive(${SUITESPARSEWIN})
+vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SUITESPARSEWIN_PATH}
+    PATCHES
+        remove-debug-postfix.patch
+)
+
+set(USE_VCPKG_METIS OFF)
+if("metis" IN_LIST FEATURES)
+    set(USE_VCPKG_METIS ON)
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(LIB_EXT a)
+    set(LIB_PREFIX lib)
+else()
+    set(LIB_EXT lib)
+    set(LIB_PREFIX)
+endif()
+
+if(WIN32)
+  set(ENABLE_CUSTOM_BLAS_LAPACK_PATHS "-DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON")
+  set(SUITESPARSE_CUSTOM_BLAS_PATH "-DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/openblas.lib")
+  set(SUITESPARSE_CUSTOM_LAPACK_PATH "-DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/lapack.lib")
+endif()
+
+message(STATUS "Use CMakeLists.txt in ${SUITESPARSEWIN_PATH}")
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SUITESPARSEWIN_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_METIS=OFF
+        -DUSE_VCPKG_METIS=${USE_VCPKG_METIS}
+        -DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}
+        -DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON
+     OPTIONS_DEBUG
+        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
+        -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/${LIB_PREFIX}openblas_d.${LIB_EXT}
+        -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/${LIB_PREFIX}lapack.${LIB_EXT}
+     OPTIONS_RELEASE
+        -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}
+        -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/${LIB_PREFIX}openblas.${LIB_EXT}
+        -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/${LIB_PREFIX}lapack.${LIB_EXT}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")
+
+#clean folders
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright of suitesparse and suitesparse-metis-for-windows
+file(COPY ${SUITESPARSE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright)
+
+file(COPY ${SUITESPARSEWIN_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright_suitesparse-metis-for-windows)