aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-04-30 15:02:18 -0700
committerGitHub <noreply@github.com>2019-04-30 15:02:18 -0700
commit9db65c78914407b952f520e9cd09a7c2e27e4a96 (patch)
treec4da5110205798a941604a9ba3a7cbdb6c6b1f0e
parent5314524f445222209aff9f372933fef0702e1913 (diff)
downloadvcpkg-9db65c78914407b952f520e9cd09a7c2e27e4a96.tar.gz
vcpkg-9db65c78914407b952f520e9cd09a7c2e27e4a96.zip
[fmi4cpp] Update to 0.7.0 (#6269)
* [fmi4cpp] update to 0.7.0 * Fix indentation * Remove duplicate feature entry
-rw-r--r--ports/fmi4cpp/CONTROL8
-rw-r--r--ports/fmi4cpp/portfile.cmake14
2 files changed, 16 insertions, 6 deletions
diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL
index 38d3b8e7f..2a05be3b5 100644
--- a/ports/fmi4cpp/CONTROL
+++ b/ports/fmi4cpp/CONTROL
@@ -1,7 +1,11 @@
Source: fmi4cpp
-Version: 0.5.3
+Version: 0.7.0
Description: FMI 2.0 implementation written in modern C++
-Build-Depends: boost-property-tree, bzip2 (linux), openssl (linux), libzip, spdlog
+Build-Depends: boost-property-tree, libzip[openssl]
+
+Feature: curl
+Build-Depends: curl
+Description: Allows loading FMUs from URL
Feature: odeint
Build-Depends: boost-ublas, boost-odeint
diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake
index 676efea3e..0952f5c5a 100644
--- a/ports/fmi4cpp/portfile.cmake
+++ b/ports/fmi4cpp/portfile.cmake
@@ -15,11 +15,16 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO NTNU-IHB/FMI4cpp
- REF v0.5.3
- SHA512 1c62f1fce4d3c0c18bc0a470827be13bc143ec8152ac75781e4d61d332b97389afc5943001e7cb8ae0ea7ebc141d88b00033de73a3d5696923a3f1c05f8ff904
+ REF v0.7.0
+ SHA512 5846f5b28badb5b4836ffd9d284f602dd243df20d3c82cab5e2b62b8be37e0ab05b7422bca066f37ca67ee0d5b35abd2febe87f623fc3b9854d245e86e1e21fe
HEAD_REF master
)
+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)
@@ -28,15 +33,16 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
+ 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(CONFIG_PATH "lib/cmake/FMI4cpp")
+vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)