mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 02:29:00 +08:00
[fmi4cpp] Update to 0.8.0 (#20907)
* Update fmi4cpp to 0.8.0 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
parent
ff67049ad6
commit
7111988a02
@ -1,25 +0,0 @@
|
||||
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>
|
||||
|
@ -1,42 +1,24 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO NTNU-IHB/FMI4cpp
|
||||
REF v0.7.0
|
||||
SHA512 5846f5b28badb5b4836ffd9d284f602dd243df20d3c82cab5e2b62b8be37e0ab05b7422bca066f37ca67ee0d5b35abd2febe87f623fc3b9854d245e86e1e21fe
|
||||
REF 0.8.0
|
||||
SHA512 547f61dfbd57593ff8839fbed3f8a5624551ee4be5e0dd7773384a869086af8a4483cfe17dc087e3f03c9ea2038b537c8c4998a405687c1a353d08e52dac411e
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-build_error.patch
|
||||
)
|
||||
|
||||
set(WITH_CURL OFF)
|
||||
if("curl" IN_LIST FEATURES)
|
||||
set(WITH_CURL ON)
|
||||
endif()
|
||||
|
||||
set(WITH_ODEINT OFF)
|
||||
if("odeint" IN_LIST FEATURES)
|
||||
set(WITH_ODEINT ON)
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DFMI4CPP_BUILD_TOOL=OFF
|
||||
-DFMI4CPP_BUILD_TESTS=OFF
|
||||
-DFMI4CPP_BUILD_EXAMPLES=OFF
|
||||
-DFMI4CPP_WITH_CURL=${WITH_CURL}
|
||||
-DFMI4CPP_WITH_ODEINT=${WITH_ODEINT}
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_fixup_cmake_targets()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "fmi4cpp",
|
||||
"version-string": "0.7.0",
|
||||
"port-version": 3,
|
||||
"version": "0.8.0",
|
||||
"description": "FMI 2.0 implementation written in modern C++",
|
||||
"homepage": "https://github.com/NTNU-IHB/FMI4cpp",
|
||||
"dependencies": [
|
||||
@ -11,21 +10,14 @@
|
||||
"features": [
|
||||
"openssl"
|
||||
]
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"curl": {
|
||||
"description": "Allows loading FMUs from URL",
|
||||
"dependencies": [
|
||||
"curl"
|
||||
]
|
||||
},
|
||||
"odeint": {
|
||||
"description": "Adds support for wrapping Model Exchange models as Co-simulation models using odeint solvers",
|
||||
"dependencies": [
|
||||
"boost-odeint",
|
||||
"boost-ublas"
|
||||
]
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -2181,8 +2181,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"fmi4cpp": {
|
||||
"baseline": "0.7.0",
|
||||
"port-version": 3
|
||||
"baseline": "0.8.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"fmilib": {
|
||||
"baseline": "2.0.3",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e4686387d546df76f71bd0086c3570d8061157cd",
|
||||
"version": "0.8.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "694ccc48c8fdade1beda9a7f87c923c8153a7735",
|
||||
"version-string": "0.7.0",
|
||||
|
Loading…
Reference in New Issue
Block a user