diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2018-02-17 14:16:32 +0300 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-17 03:16:32 -0800 |
| commit | 18be859328565eec58b6eb5952b585f66cb6b6fd (patch) | |
| tree | fbecbe14558040ba3267ef8f784ecf5c01715b1a /ports/suitesparse | |
| parent | 6142925568ed0b8532feb40453dc556c2f3fa4d7 (diff) | |
| download | vcpkg-18be859328565eec58b6eb5952b585f66cb6b6fd.tar.gz vcpkg-18be859328565eec58b6eb5952b585f66cb6b6fd.zip | |
Ceres and SuiteSparse features (#2800)
* [suitesparse] Implement optional feature: metis
* [ceres] Implement optional features: lapack, suitesparse, cxsparse, eigen. Closes #2798
* [ceres] Always require Eigen3
Diffstat (limited to 'ports/suitesparse')
| -rw-r--r-- | ports/suitesparse/CONTROL | 8 | ||||
| -rw-r--r-- | ports/suitesparse/fix-install-suitesparse.patch | 19 | ||||
| -rw-r--r-- | ports/suitesparse/portfile.cmake | 7 |
3 files changed, 28 insertions, 6 deletions
diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL index af5e1b631..702692497 100644 --- a/ports/suitesparse/CONTROL +++ b/ports/suitesparse/CONTROL @@ -1,4 +1,8 @@ Source: suitesparse -Version: 4.5.5-3 -Build-Depends: metis, clapack +Version: 4.5.5-4 +Build-Depends: clapack Description: algebra library + +Feature: metis +Build-Depends: metis +Description: Use metis in SuiteSparse diff --git a/ports/suitesparse/fix-install-suitesparse.patch b/ports/suitesparse/fix-install-suitesparse.patch index 4da6e73f4..a5b5400fa 100644 --- a/ports/suitesparse/fix-install-suitesparse.patch +++ b/ports/suitesparse/fix-install-suitesparse.patch @@ -1,7 +1,20 @@ -diff --git "a/SuiteSparse/CMakeLists.txt" "b/SuiteSparse/CMakeLists.txt" +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8227298..c0eb354 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,7 @@ ELSE() + ENDIF() + ENDIF() + +-IF(BUILD_METIS) ++IF(BUILD_METIS OR USE_VCPKG_METIS) + set(SuiteSparse_LINKER_METIS_LIBS "metis") + else() + set(SuiteSparse_LINKER_METIS_LIBS "") +diff --git a/SuiteSparse/CMakeLists.txt b/SuiteSparse/CMakeLists.txt index 7361363..8a48cf3 100644 ---- "a/SuiteSparse/CMakeLists.txt" -+++ "b/SuiteSparse/CMakeLists.txt" +--- a/SuiteSparse/CMakeLists.txt ++++ b/SuiteSparse/CMakeLists.txt @@ -10,7 +10,11 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") IF (BUILD_METIS) INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake index ce97c4b9f..75399609e 100644 --- a/ports/suitesparse/portfile.cmake +++ b/ports/suitesparse/portfile.cmake @@ -45,12 +45,17 @@ vcpkg_apply_patches( 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=ON #Force using vcpckg metis library + -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 |