Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[quantlib] update to 1.24 #21068

Merged
merged 17 commits into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions ports/quantlib/disable-examples-tests.patch

This file was deleted.

15 changes: 0 additions & 15 deletions ports/quantlib/fix-mac-build.patch

This file was deleted.

21 changes: 9 additions & 12 deletions ports/quantlib/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lballabio/QuantLib
REF QuantLib-v1.22
SHA512 279c2e9273dd0fbc03d19ac19814e8a3b5544545cc1441982232f89bd313fe76b6e252dbcae8a3d146ecc4f1d1e64632ac412096b89da882ba879a66776fdb91
REF QuantLib-v1.24
SHA512 1a63d90363cda69e20e40a60a2d6357f632fac997df520b949e73feb256dac8a999395d0ebe94734ac630e9104e512b0a545f6a2111b287a41e9128127aa5bb0
HEAD_REF master
PATCHES
disable-examples-tests.patch
fix-mac-build.patch # fixed in next release
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" USE_BOOST_DYNAMIC_LIBRARIES)

set(QL_MSVC_RUNTIME ${VCPKG_LIBRARY_LINKAGE})

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if (VCPKG_TARGET_IS_WINDOWS)
# This can (and should) be removed if QuantLib ever supports dynamically linking on Windows
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DUSE_BOOST_DYNAMIC_LIBRARIES=${USE_BOOST_DYNAMIC_LIBRARIES}
-DMSVC_RUNTIME=${QL_MSVC_RUNTIME}
-DQL_BUILD_BENCHMARK=OFF
-DQL_BUILD_EXAMPLES=OFF
-DQL_BUILD_TEST_SUITE=OFF
)

vcpkg_install_cmake()
Expand Down
4 changes: 3 additions & 1 deletion ports/quantlib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "quantlib",
"version": "1.22",
"version": "1.24",
"description": "The QuantLib C++ library",
"homepage": "https://www.quantlib.org/",
"supports": "!(windows & dynamic)",
sweemer marked this conversation as resolved.
Show resolved Hide resolved
"dependencies": [
"boost-accumulators",
"boost-algorithm",
Expand Down Expand Up @@ -30,6 +31,7 @@
"boost-serialization",
"boost-signals2",
"boost-smart-ptr",
"boost-test",
"boost-thread",
"boost-tuple",
"boost-type-traits",
Expand Down
3 changes: 3 additions & 0 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1217,6 +1217,9 @@ qpid-proton:arm-uwp=fail
qpid-proton:x64-uwp=fail
qpid-proton:x64-windows-static=fail
qt5-base:arm64-windows=fail
quantlib:arm64-windows=fail
quantlib:x64-windows=fail
quantlib:x86-windows=fail
sweemer marked this conversation as resolved.
Show resolved Hide resolved
# Skip deprecated Qt module
# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
qt5-canvas3d:x64-linux=skip
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5765,7 +5765,7 @@
"port-version": 1
},
"quantlib": {
"baseline": "1.22",
"baseline": "1.24",
"port-version": 0
},
"quaternions": {
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/quantlib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4b6d26478b7c67c56606d0c00f53a7deaa2b8dfa",
"version": "1.24",
"port-version": 0
},
{
"git-tree": "b2d3e38a4ca6467154bf1a46fd2663d937c3858b",
"version": "1.22",
Expand Down