Tested, OK

3 files changed, 45 insertions, 15 deletions

diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL
index e2340b457..237112257 100644
--- a/ports/suitesparse/CONTROL
+++ b/ports/suitesparse/CONTROL
@@ -1,4 +1,4 @@
 Source: suitesparse
 Version: 4.5.5
-#Build-Depends: metis
+Build-Depends: metis, clapack
 Description: algebra library
diff --git a/ports/suitesparse/fix-install-suitesparse.patch b/ports/suitesparse/fix-install-suitesparse.patch
new file mode 100644
index 000000000..ca8cbbd97
--- /dev/null
+++ b/ports/suitesparse/fix-install-suitesparse.patch
@@ -0,0 +1,19 @@
+diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
+index 679df4e..0a01d47 100644
+--- "a/CMakeLists.txt"
++++ "b/CMakeLists.txt"
+@@ -106,10 +106,10 @@ macro(install_suitesparse_project targetName headersList)
+ 	set_target_properties(${targetName} PROPERTIES PUBLIC_HEADER "${headersList}")
+ 	install(TARGETS	${targetName}
+ 			EXPORT 	SuiteSparse
+-			RUNTIME DESTINATION bin
+-			LIBRARY DESTINATION lib${LIB_POSTFIX}
+-			ARCHIVE DESTINATION lib${LIB_POSTFIX}
+-			PUBLIC_HEADER DESTINATION include/suitesparse
++			RUNTIME DESTINATION ${suitesparse_PKG_DIR}/$<$<CONFIG:Debug>:Debug/>bin
++			LIBRARY DESTINATION ${suitesparse_PKG_DIR}/$<$<CONFIG:Debug>:Debug/>lib
++			ARCHIVE DESTINATION ${suitesparse_PKG_DIR}/$<$<CONFIG:Debug>:Debug/>lib
++			PUBLIC_HEADER DESTINATION ${suitesparse_PKG_DIR}/include/suitesparse
+ 	)
+ endmacro()
+ 	
diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake
index 38ff80eb1..0e5e9ad4b 100644
--- a/ports/suitesparse/portfile.cmake
+++ b/ports/suitesparse/portfile.cmake
@@ -14,22 +14,23 @@ include(vcpkg_common_functions)
 
 set(SUITESPARSE_VER SuiteSparse-4.5.5)  #if you change the version, becarefull of changing the SHA512 checksum accordingly
 set(METIS_VER metis-5.1.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-1.3.1)
-set(SUITESPARSE_PATH ${SOURCE_PATH}/Suitesparse)
-set(METIS_PATH ${SOURCE_PATH}/metis)
-
-
+set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-1.3.1)
+set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/Suitesparse)
+set(METIS_PATH ${SUITESPARSEWIN_PATH}/metis)
 
+#CMake scripts for painless usage of SuiteSparse+METIS from Visual Studio and the rest of Windows/Linux/OSX IDEs supported by CMake 
 vcpkg_download_distfile(SUITESPARSEWIN
 URLS  "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v1.3.1.zip"
 FILENAME "suitesparse-metis-for-windows-1.3.1.zip"
 SHA512 f8b9377420432f1c0a05bf884fe9e72f1f4eaf7e05663c66a383b5d8ddbd4fbfaa7d433727b4dc3e66b41dbb96b1327d380b68a51a424276465512666e63393d
 )
+#suitesparse libary
 vcpkg_download_distfile(SUITESPARSE
     URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz"
     FILENAME "${SUITESPARSE_VER}.tar.gz"
     SHA512 4337c683027efca6c0800815587409db14db7d70df673451e307eb3ece5538815d06d90f3a831fa45071372f70b6f37eaa68fe951f69dbb52a5bfd84d2dc4913
 )
+#Metis library
 vcpkg_download_distfile(METIS
     URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METIS_VER}.tar.gz"
     FILENAME "${METIS_VER}.tar.gz"
@@ -39,29 +40,39 @@ vcpkg_download_distfile(METIS
 vcpkg_extract_source_archive(${SUITESPARSEWIN})
 
 #extract suitesparse and copy into suitesparse folder in suitesparse-metis-for-windows package
-vcpkg_extract_source_archive(${SUITESPARSE} ${SOURCE_PATH})
+vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH})
 
 #extract metis and copy into metis folder in suitesparse-metis-for-windows package
 vcpkg_extract_source_archive(${METIS})
 file(COPY ${CURRENT_BUILDTREES_DIR}/src/${METIS_VER} DESTINATION ${METIS_PATH})
 
+
 vcpkg_apply_patches(
     SOURCE_PATH ${METIS_PATH}
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/metis.patch"           
 )
+vcpkg_apply_patches(
+    SOURCE_PATH ${SUITESPARSEWIN_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-suitesparse.patch"           
+)
+
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-	#PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    SOURCE_PATH ${SUITESPARSEWIN_PATH}
+	 PREFER_NINJA # Disable this option if project cannot be built with Ninja
      OPTIONS
-	-DBUILD_METIS=ON 
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
-      
+	-DBUILD_METIS=ON    
+	-DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON
+	-DSUITESPARSE_CUSTOM_BLAS_LIB=${VCPKG_ROOT_DIR}/packages/openblas_${TARGET_TRIPLET}/lib/openblas.lib
+	-DSUITESPARSE_CUSTOM_LAPACK_LIB=${VCPKG_ROOT_DIR}/packages/clapack_${TARGET_TRIPLET}/lib/lapack.lib
+	-Dsuitesparse_PKG_DIR=${CURRENT_PACKAGES_DIR}
+     #OPTIONS_RELEASE
+	 #OPTIONS_DEBUG     
 )
-vcpkg_build_cmake()
+vcpkg_install_cmake()
+
 
-# Handle copyright
+# Handle copyright of suitesparse and metis
 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 ${METIS_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)