aboutsummaryrefslogtreecommitdiff
path: root/ports/fmi4cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ports/fmi4cpp')
-rw-r--r--ports/fmi4cpp/CONTROL3
-rw-r--r--ports/fmi4cpp/fix-build_error.patch25
-rw-r--r--ports/fmi4cpp/portfile.cmake23
3 files changed, 34 insertions, 17 deletions
diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL
index 2a05be3b5..20f8f641c 100644
--- a/ports/fmi4cpp/CONTROL
+++ b/ports/fmi4cpp/CONTROL
@@ -1,5 +1,6 @@
Source: fmi4cpp
-Version: 0.7.0
+Version: 0.7.0-2
+Homepage: https://github.com/NTNU-IHB/FMI4cpp
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..6babc78ed 100644
--- a/ports/fmi4cpp/portfile.cmake
+++ b/ports/fmi4cpp/portfile.cmake
@@ -1,15 +1,3 @@
-# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
include(vcpkg_common_functions)
vcpkg_from_github(
@@ -18,6 +6,8 @@ vcpkg_from_github(
REF v0.7.0
SHA512 5846f5b28badb5b4836ffd9d284f602dd243df20d3c82cab5e2b62b8be37e0ab05b7422bca066f37ca67ee0d5b35abd2febe87f623fc3b9854d245e86e1e21fe
HEAD_REF master
+ PATCHES
+ fix-build_error.patch
)
set(WITH_CURL OFF)
@@ -38,7 +28,7 @@ vcpkg_configure_cmake(
-DFMI4CPP_BUILD_TESTS=OFF
-DFMI4CPP_BUILD_EXAMPLES=OFF
-DFMI4CPP_WITH_CURL=${WITH_CURL}
- -DFMI4CPP_WITH_ODEINT=${WITH_ODEINT}
+ -DFMI4CPP_WITH_ODEINT=${WITH_ODEINT}
)
vcpkg_install_cmake()
@@ -47,7 +37,8 @@ vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmi4cpp RENAME copyright)
-
vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+