diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-01-17 00:50:46 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-16 15:50:45 -0800 |
| commit | e8489a46c11775036f82e9f6ecc25d61feecee66 (patch) | |
| tree | f8c0d3530f3eafff2b0c42663c488a8fab8699b2 /ports/parmetis | |
| parent | 13ec61a842588480f49d3c3a6a3b42d70df4fa84 (diff) | |
| download | vcpkg-e8489a46c11775036f82e9f6ecc25d61feecee66.tar.gz vcpkg-e8489a46c11775036f82e9f6ecc25d61feecee66.zip | |
[msmpi] update to 10.0 (#5107)
* [msmpi] update to 10.0
* [parmetis] fix build error
Diffstat (limited to 'ports/parmetis')
| -rw-r--r-- | ports/parmetis/portfile.cmake | 17 | ||||
| -rw-r--r-- | ports/parmetis/use_stdint.patch | 22 |
2 files changed, 31 insertions, 8 deletions
diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index c6022ad47..ba34e47e8 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -7,21 +7,22 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/parmetis-4.0.3) + vcpkg_download_distfile(ARCHIVE URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz" FILENAME "parmetis-4.0.3.tar.gz" SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-metis-vs14-math.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-gklib-vs14-math.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-root-cmakelist.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-libparmetis-cmakelist.patch + fix-metis-vs14-math.patch + fix-gklib-vs14-math.patch + fix-root-cmakelist.patch + fix-libparmetis-cmakelist.patch + use_stdint.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/parmetis/use_stdint.patch b/ports/parmetis/use_stdint.patch new file mode 100644 index 000000000..5b239e60c --- /dev/null +++ b/ports/parmetis/use_stdint.patch @@ -0,0 +1,22 @@ +diff --git a/metis/GKlib/ms_stdint.h b/metis/GKlib/ms_stdint.h
+index 7e200dc..0d07a7a 100644
+--- a/metis/GKlib/ms_stdint.h
++++ b/metis/GKlib/ms_stdint.h
+@@ -42,6 +42,10 @@
+
+ #include <limits.h>
+
++#if(_MSC_VER >= 1900)
++ #include <stdint.h>
++#else
++
+ // For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+ // or compiler give many errors like this:
+ // error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+@@ -218,5 +222,6 @@ typedef uint64_t uintmax_t;
+
+ #endif // __STDC_CONSTANT_MACROS ]
+
++#endif
+
+ #endif // _MSC_STDINT_H_ ]
|