Merge branch 'master' into merge-quantlib-latest-master

ralfkonrad · Oct 21, 2024 · fdfafb6 · fdfafb6
2 parents 29faada + bb6f544
commit fdfafb6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/actions/build_native_library/env_variables/action.yml b/.github/actions/build_native_library/env_variables/action.yml
@@ -42,6 +42,6 @@ runs:
         Write "BOOST_INSTALL_DIR=$env:RUNNER_TEMP\boost"                                                                                >> $env:GITHUB_ENV
         Write "Boost_DIR=$env:RUNNER_TEMP\boost\lib64-msvc-14.3\cmake\Boost-1.86.0"                                                     >> $env:GITHUB_ENV
 
-        Write "SWIG_DOWNLOAD_URI=https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.2.1/swigwin-4.2.1.zip/download"          >> $env:GITHUB_ENV
-        Write "SWIG_ZIP_FILE_PATH=$env:RUNNER_TEMP\swigwin-4.2.1.zip"                                                                   >> $env:GITHUB_ENV
-        Write "$env:RUNNER_TEMP\swigwin-4.2.1"                                                                                          >> $env:GITHUB_PATH
+        Write "SWIG_DOWNLOAD_URI=https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.3.0/swigwin-4.3.0.zip/download"          >> $env:GITHUB_ENV
+        Write "SWIG_ZIP_FILE_PATH=$env:RUNNER_TEMP\swigwin-4.3.0.zip"                                                                   >> $env:GITHUB_ENV
+        Write "$env:RUNNER_TEMP\swigwin-4.3.0"                                                                                          >> $env:GITHUB_PATH
diff --git a/.github/actions/build_native_library/setup/action.yml b/.github/actions/build_native_library/setup/action.yml
@@ -35,12 +35,13 @@ runs:
         
         eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
         brew update
-        brew install swig boost
+        brew install boost swig
 
     - name: Setup macOs
       if: runner.os == 'macOs'
       shell: bash
       run: |
+        brew update
         brew install boost ninja swig
 
     - name: Setup Windows

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(quantlib_for_maven VERSION 1.36.0 LANGUAGES CXX)
 # set the Boost and Swig versions we want to use
 # to ensure compatibility across linux, macos and windows builds
 set(QL_MVN_BOOST_VERSION "1.86.0" CACHE STRING "Boost version we want to use to ensure compatibility")
-set(QL_MVN_SWIG_VERSION "4.2.1" CACHE STRING "Swig version we want to use to ensure compatibility")
+set(QL_MVN_SWIG_VERSION "4.3.0" CACHE STRING "Swig version we want to use to ensure compatibility")
 
 # set the QuantLib options the way we need them.
 # So, they do not need to be provided in the presets or as a cmake -D cache entry.