diff options
| author | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
|---|---|---|
| committer | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
| commit | e27fe911982284788e63f4a92339386554706a4b (patch) | |
| tree | e695af1d6733cea93a29adab73ff819430ff872e /ports/fmi4cpp | |
| parent | 1586330395db0bfa14c40c4b1a8d4da6c8f7c5f7 (diff) | |
| parent | 62ed7c17318b4f46109c2de73b7584fb04e85720 (diff) | |
| download | vcpkg-e27fe911982284788e63f4a92339386554706a4b.tar.gz vcpkg-e27fe911982284788e63f4a92339386554706a4b.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump
Diffstat (limited to 'ports/fmi4cpp')
| -rw-r--r-- | ports/fmi4cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fmi4cpp/fix-build_error.patch | 25 | ||||
| -rw-r--r-- | ports/fmi4cpp/portfile.cmake | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL index 2a05be3b5..4659e9d1a 100644 --- a/ports/fmi4cpp/CONTROL +++ b/ports/fmi4cpp/CONTROL @@ -1,5 +1,5 @@ Source: fmi4cpp -Version: 0.7.0 +Version: 0.7.0-1 Description: FMI 2.0 implementation written in modern C++ Build-Depends: boost-property-tree, libzip[openssl] diff --git a/ports/fmi4cpp/fix-build_error.patch b/ports/fmi4cpp/fix-build_error.patch new file mode 100644 index 000000000..ef0950e87 --- /dev/null +++ b/ports/fmi4cpp/fix-build_error.patch @@ -0,0 +1,25 @@ +diff --git a/include/fmi4cpp/fmu_resource.hpp b/include/fmi4cpp/fmu_resource.hpp +index 98f2067..8e88dcf 100644 +--- a/include/fmi4cpp/fmu_resource.hpp ++++ b/include/fmi4cpp/fmu_resource.hpp +@@ -24,6 +24,7 @@ + + #ifndef FMI4CPP_FMURESOURCE_HPP + #define FMI4CPP_FMURESOURCE_HPP ++#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING + + #include <string> + #include <experimental/filesystem> +diff --git a/src/fmi2/fmu.cpp b/src/fmi2/fmu.cpp +index a0d5f75..bd01487 100644 +--- a/src/fmi2/fmu.cpp ++++ b/src/fmi2/fmu.cpp +@@ -26,6 +26,8 @@ + #include <curl/curl.h> + #endif + ++#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING ++ + #include <utility> + #include <experimental/filesystem> + diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake index 0952f5c5a..ad45b5abe 100644 --- a/ports/fmi4cpp/portfile.cmake +++ b/ports/fmi4cpp/portfile.cmake @@ -18,6 +18,8 @@ vcpkg_from_github( REF v0.7.0 SHA512 5846f5b28badb5b4836ffd9d284f602dd243df20d3c82cab5e2b62b8be37e0ab05b7422bca066f37ca67ee0d5b35abd2febe87f623fc3b9854d245e86e1e21fe HEAD_REF master + PATCHES + fix-build_error.patch ) set(WITH_CURL OFF) |