Skip to content

Commit

Permalink
Merge branch 'master' into deprecated-1-22
Browse files Browse the repository at this point in the history
  • Loading branch information
lballabio committed Apr 21, 2022
2 parents cc5f2c7 + aca86a2 commit ad96e45
Show file tree
Hide file tree
Showing 397 changed files with 2,941 additions and 4,086 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
@@ -1,5 +1,5 @@
image:
- Visual Studio 2013
- Visual Studio 2015
- Visual Studio 2022

platform: x64
Expand All @@ -16,9 +16,9 @@ for:
-
matrix:
only:
- image: Visual Studio 2013
- image: Visual Studio 2015
before_build:
- COPY .appveyor\VS2013.props .\Build.props
- COPY .appveyor\VS2015.props .\Build.props
test_script:
- .\test-suite\bin\QuantLib-test-suite-x64-mt.exe --log_level=message --build_info=yes -- --faster
-
Expand Down
4 changes: 2 additions & 2 deletions .appveyor/VS2013.props → .appveyor/VS2015.props
Expand Up @@ -4,10 +4,10 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>C:\Libraries\boost_1_58_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\Libraries\boost_1_69_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>C:\Libraries\boost_1_58_0\lib64-msvc-12.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\Libraries\boost_1_69_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/linux-full-tests.yml
Expand Up @@ -140,19 +140,6 @@ jobs:
cc: gcc
cxx: g++
configureflags: --enable-std-classes
- name: "auto_ptr re-enabled"
shortname: autoptr
tag: rolling
cc: gcc
cxx: g++
cxxflags: "-Wno-deprecated-declarations"
configureflags: --disable-std-unique-ptr
- name: "Disposable re-enabled"
shortname: disposable
tag: rolling
cc: gcc
cxx: g++
configureflags: --enable-disposable
- name: "Thread-safe observer enabled"
shortname: threadsafe
tag: rolling
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/linux.yml
Expand Up @@ -145,21 +145,6 @@ jobs:
cxx: g++
configureflags: --enable-std-classes
tests: true
- name: "auto_ptr re-enabled"
shortname: autoptr
tag: rolling
cc: gcc
cxx: g++
cxxflags: "-Wno-deprecated-declarations"
configureflags: --disable-std-unique-ptr
tests: true
- name: "Disposable re-enabled"
shortname: disposable
tag: rolling
cc: gcc
cxx: g++
configureflags: --enable-disposable
tests: true
- name: "Thread-safe observer enabled"
shortname: threadsafe
tag: rolling
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/msvc-analysis.yml
Expand Up @@ -43,7 +43,7 @@ jobs:
sarif_file: ${{ steps.run-analysis.outputs.sarif }}

- name: Upload SARIF as an Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: sarif-file
path: ${{ steps.run-analysis.outputs.sarif }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Expand Up @@ -6,7 +6,7 @@ jobs:
staleness-check:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue was automatically marked as stale because it has been open 60 days with no activity. Remove stale label or comment, or this will be closed in two weeks.'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-times.yml
Expand Up @@ -30,7 +30,7 @@ jobs:
./test-suite/quantlib-test-suite --logger=JUNIT,warning,fast.xml:HRF,message -- --fast
./test-suite/quantlib-test-suite --logger=JUNIT,warning,all.xml:HRF,message
- name: Save test times
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: test-reports
path: ./all.xml
Expand Down
7 changes: 2 additions & 5 deletions CMakeLists.txt
Expand Up @@ -5,14 +5,14 @@ cmake_policy(SET CMP0091 NEW)

# Version info
set(QUANTLIB_VERSION_MAJOR 1)
set(QUANTLIB_VERSION_MINOR 26)
set(QUANTLIB_VERSION_MINOR 27)
set(QUANTLIB_VERSION_PATCH 0)
set(QUANTLIB_VERSION ${QUANTLIB_VERSION_MAJOR}.${QUANTLIB_VERSION_MINOR}.${QUANTLIB_VERSION_PATCH})

# Project Info
set(PACKAGE_NAME "QuantLib")
set(PACKAGE_VERSION "${QUANTLIB_VERSION}-dev")
set(PACKAGE_VERSION_HEX "0x01260000")
set(PACKAGE_VERSION_HEX "0x01270000")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/lballabio/QuantLib/issues/")
Expand Down Expand Up @@ -57,18 +57,15 @@ option(QL_INSTALL_EXAMPLES "Install examples" ON)
option(QL_INSTALL_TEST_SUITE "Install test suite" ON)
option(QL_TAGGED_LAYOUT "Library names use layout tags" ${MSVC})
option(QL_USE_CLANG_TIDY "Use clang-tidy when building" OFF)
option(QL_USE_DISPOSABLE "Use the Disposable class template. Not needed for C++11" OFF)
option(QL_USE_INDEXED_COUPON "Use indexed coupons instead of par coupons" OFF)
option(QL_USE_STD_CLASSES "Enable all QL_USE_STD_ options" OFF)
option(QL_USE_STD_SHARED_PTR "Use standard smart pointers instead of Boost ones" OFF)
option(QL_USE_STD_UNIQUE_PTR "Use std::unique_ptr instead of std::auto_ptr" ON)
option(QL_USE_STD_FUNCTION "Use std::function and std::bind instead of Boost ones" OFF)
option(QL_USE_STD_TUPLE "Use std::tuple instead of boost::tuple" OFF)

# Convenience option to activate all STD options
if (QL_USE_STD_CLASSES)
set(QL_USE_STD_SHARED_PTR ON)
set(QL_USE_STD_UNIQUE_PTR ON)
set(QL_USE_STD_FUNCTION ON)
set(QL_USE_STD_TUPLE ON)
endif()
Expand Down

0 comments on commit ad96e45

Please sign in to comment.