From 7d3aeba6849b0be8517686e84c70f35c9f19f908 Mon Sep 17 00:00:00 2001
From: Jonathan Sweemer <sweemer@gmail.com>
Date: Fri, 12 Nov 2021 06:38:44 +0900
Subject: [PATCH] [quantlib] update to 1.24 (#21068)

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24

* [quantlib] update to 1.24
---
 ports/quantlib/disable-examples-tests.patch | 13 -------------
 ports/quantlib/fix-mac-build.patch          | 15 ---------------
 ports/quantlib/portfile.cmake               | 21 +++++++++------------
 ports/quantlib/vcpkg.json                   |  4 +++-
 versions/baseline.json                      |  2 +-
 versions/q-/quantlib.json                   |  5 +++++
 6 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 ports/quantlib/disable-examples-tests.patch
 delete mode 100644 ports/quantlib/fix-mac-build.patch

diff --git a/ports/quantlib/disable-examples-tests.patch b/ports/quantlib/disable-examples-tests.patch
deleted file mode 100644
index b42e0bc255..0000000000
--- a/ports/quantlib/disable-examples-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d046251cc..d8201bf6a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,8 +44,6 @@ if (Boost_FOUND)
- endif (Boost_FOUND)
- 
- add_subdirectory(ql)
--add_subdirectory(Examples)
--add_subdirectory(test-suite)
- 
- #
- # Copy across the ANSI config file into the build directory. Users
diff --git a/ports/quantlib/fix-mac-build.patch b/ports/quantlib/fix-mac-build.patch
deleted file mode 100644
index a114f96e7d..0000000000
--- a/ports/quantlib/fix-mac-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 62ab08a115..2b383c1dd5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,10 @@ cmake_minimum_required()
- 
- project(QuantLib)
- 
-+if(APPLE AND NOT CMAKE_CXX_STANDARD)
-+    set(CMAKE_CXX_STANDARD 11)
-+endif()
-+
- include(CTest)
- include(${CMAKE_CURRENT_LIST_DIR}/cmake/quantlib.cmake)
- 
diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake
index f7cf9b7770..5f110915cf 100644
--- a/ports/quantlib/portfile.cmake
+++ b/ports/quantlib/portfile.cmake
@@ -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()
diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json
index ee732abc26..e4d37e9444 100644
--- a/ports/quantlib/vcpkg.json
+++ b/ports/quantlib/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "quantlib",
-  "version": "1.22",
+  "version": "1.24",
   "description": "The QuantLib C++ library",
   "homepage": "https://www.quantlib.org/",
+  "supports": "!(windows & !static)",
   "dependencies": [
     "boost-accumulators",
     "boost-algorithm",
@@ -30,6 +31,7 @@
     "boost-serialization",
     "boost-signals2",
     "boost-smart-ptr",
+    "boost-test",
     "boost-thread",
     "boost-tuple",
     "boost-type-traits",
diff --git a/versions/baseline.json b/versions/baseline.json
index 415f9b5591..9c70bb5eb0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5777,7 +5777,7 @@
       "port-version": 1
     },
     "quantlib": {
-      "baseline": "1.22",
+      "baseline": "1.24",
       "port-version": 0
     },
     "quaternions": {
diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json
index 5e0cca721e..3277be8627 100644
--- a/versions/q-/quantlib.json
+++ b/versions/q-/quantlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d8519a43e706ff22152e65942f48e5abd75bb76f",
+      "version": "1.24",
+      "port-version": 0
+    },
     {
       "git-tree": "b2d3e38a4ca6467154bf1a46fd2663d937c3858b",
       "version": "1.22",