Skip to content

Commit 19bef5c

Browse files
rolandlichtersrolandlichters
committed
merge master, resolve conflicts
2 parents 3d5a4ea + 1cf590d commit 19bef5c

83 files changed

Lines changed: 8433 additions & 11606 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
21
cmake_minimum_required(VERSION 3.8)
32

43
project(ORE-SWIG)
5-
6-
#add_subdirectory(QuantExt-SWIG/Python)
7-
#add_subdirectory(OREData-SWIG/Python)
4+
85
add_subdirectory(OREAnalytics-SWIG/Python)
9-
#add_subdirectory(OREAnalytics-SWIG/Java)
10-
#add_subdirectory(QuantExt-SWIG/Java)
11-
#add_subdirectory(OREData-SWIG/Java)
6+

‎CMakePresets.json‎

Lines changed: 236 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,236 @@
1+
{
2+
"version": 2,
3+
"configurePresets": [
4+
{
5+
"name": "windows-ninja-x64-debug",
6+
"binaryDir": "${sourceDir}/build",
7+
"generator": "Ninja Multi-Config",
8+
"cacheVariables": {
9+
"CMAKE_CXX_COMPILER": "cl.exe",
10+
"CMAKE_BUILD_TYPE": "Debug",
11+
"BOOST_INCLUDEDIR": "$env{BOOST}",
12+
"BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
13+
"ORE": "$env{ORE}",
14+
"ORE_BUILD": "$env{ORE_BUILD}",
15+
"QL_BUILD_EXAMPLES": false,
16+
"QL_BUILD_TEST_SUITE": false,
17+
"QL_BUILD_BENCHMARK": false,
18+
"MSVC_LINK_DYNAMIC_RUNTIME": true,
19+
"MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
20+
"QL_ENABLE_SESSIONS": true,
21+
"ORE_BUILD_DOC": true,
22+
"OREPLUS_LICENSE": false,
23+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
24+
},
25+
"architecture": {
26+
"value": "x64",
27+
"strategy": "external"
28+
},
29+
"vendor": {
30+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
31+
"intelliSenseMode": "windows-msvc-x64",
32+
"hostOS": [
33+
"Windows"
34+
]
35+
}
36+
}
37+
},
38+
{
39+
"name": "windows-ninja-x64-relWithDebInfo",
40+
"binaryDir": "${sourceDir}/build",
41+
"generator": "Ninja Multi-Config",
42+
"cacheVariables": {
43+
"CMAKE_CXX_COMPILER": "cl.exe",
44+
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
45+
"BOOST_INCLUDEDIR": "$env{BOOST}",
46+
"BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
47+
"ORE": "$env{ORE}",
48+
"ORE_BUILD": "$env{ORE_BUILD}",
49+
"QL_BUILD_EXAMPLES": false,
50+
"QL_BUILD_TEST_SUITE": false,
51+
"QL_BUILD_BENCHMARK": false,
52+
"MSVC_LINK_DYNAMIC_RUNTIME": true,
53+
"MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
54+
"QL_ENABLE_SESSIONS": true,
55+
"ORE_BUILD_DOC": true,
56+
"OREPLUS_LICENSE": false,
57+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
58+
},
59+
"architecture": {
60+
"value": "x64",
61+
"strategy": "external"
62+
},
63+
"vendor": {
64+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
65+
"intelliSenseMode": "windows-msvc-x64",
66+
"hostOS": [
67+
"Windows"
68+
]
69+
}
70+
}
71+
},
72+
{
73+
"name": "windows-ninja-x64-release",
74+
"binaryDir": "${sourceDir}/build",
75+
"generator": "Ninja Multi-Config",
76+
"cacheVariables": {
77+
"CMAKE_CXX_COMPILER": "cl.exe",
78+
"CMAKE_BUILD_TYPE": "Release",
79+
"BOOST_INCLUDEDIR": "$env{BOOST}",
80+
"BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
81+
"ORE": "$env{ORE}",
82+
"ORE_BUILD": "$env{ORE_BUILD}",
83+
"QL_BUILD_EXAMPLES": false,
84+
"QL_BUILD_TEST_SUITE": false,
85+
"QL_BUILD_BENCHMARK": false,
86+
"MSVC_LINK_DYNAMIC_RUNTIME": true,
87+
"MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
88+
"QL_ENABLE_SESSIONS": true,
89+
"ORE_BUILD_DOC": true,
90+
"OREPLUS_LICENSE": false,
91+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
92+
},
93+
"architecture": {
94+
"value": "x64",
95+
"strategy": "external"
96+
},
97+
"vendor": {
98+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
99+
"intelliSenseMode": "windows-msvc-x64",
100+
"hostOS": [
101+
"Windows"
102+
]
103+
}
104+
}
105+
},
106+
{
107+
"name": "windows-msvc-x64",
108+
"binaryDir": "${sourceDir}/build",
109+
"generator": "Visual Studio 17 2022",
110+
"cacheVariables": {
111+
"BOOST_INCLUDEDIR": "$env{BOOST}",
112+
"BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
113+
"ORE": "$env{ORE}",
114+
"ORE_BUILD": "$env{ORE_BUILD}",
115+
"QL_BUILD_EXAMPLES": false,
116+
"QL_BUILD_TEST_SUITE": false,
117+
"QL_BUILD_BENCHMARK": false,
118+
"MSVC_LINK_DYNAMIC_RUNTIME": true,
119+
"MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
120+
"QL_ENABLE_SESSIONS": true,
121+
"ORE_BUILD_DOC": true,
122+
"OREPLUS_LICENSE": false,
123+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
124+
},
125+
"architecture": {
126+
"value": "x64",
127+
"strategy": "set"
128+
},
129+
"vendor": {
130+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
131+
"intelliSenseMode": "windows-msvc-x64",
132+
"hostOS": [
133+
"Windows"
134+
]
135+
}
136+
}
137+
},
138+
{
139+
"name": "windows-msvc-x64-static",
140+
"binaryDir": "${sourceDir}/build",
141+
"generator": "Visual Studio 17 2022",
142+
"cacheVariables": {
143+
"BOOST_INCLUDEDIR": "$env{BOOST}",
144+
"BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
145+
"ORE": "$env{ORE}",
146+
"ORE_BUILD": "$env{ORE_BUILD}",
147+
"QL_BUILD_EXAMPLES": false,
148+
"QL_BUILD_TEST_SUITE": false,
149+
"QL_BUILD_BENCHMARK": false,
150+
"MSVC_LINK_DYNAMIC_RUNTIME": false,
151+
"MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
152+
"QL_ENABLE_SESSIONS": true,
153+
"ORE_BUILD_DOC": true,
154+
"OREPLUS_LICENSE": false,
155+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
156+
},
157+
"architecture": {
158+
"value": "x64",
159+
"strategy": "set"
160+
},
161+
"vendor": {
162+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
163+
"intelliSenseMode": "windows-msvc-x64",
164+
"hostOS": [
165+
"Windows"
166+
]
167+
}
168+
}
169+
}
170+
],
171+
"buildPresets": [
172+
{
173+
"name": "windows-ninja-x64-release",
174+
"configurePreset": "windows-ninja-x64-release",
175+
"configuration": "Release"
176+
},
177+
{
178+
"name": "windows-ninja-x64-relWithDebInfo",
179+
"configurePreset": "windows-ninja-x64-relWithDebInfo",
180+
"configuration": "RelWithDebInfo"
181+
},
182+
{
183+
"name": "windows-ninja-x64-debug",
184+
"configurePreset": "windows-ninja-x64-debug",
185+
"configuration": "Debug"
186+
},
187+
{
188+
"name": "windows-msvc-x64-release",
189+
"configurePreset": "windows-msvc-x64",
190+
"configuration": "Release",
191+
"nativeToolOptions": [
192+
"-m"
193+
]
194+
},
195+
{
196+
"name": "windows-msvc-x64-relWithDebInfo",
197+
"configurePreset": "windows-msvc-x64",
198+
"configuration": "RelWithDebInfo",
199+
"nativeToolOptions": [
200+
"-m"
201+
]
202+
},
203+
{
204+
"name": "windows-msvc-x64-debug",
205+
"configurePreset": "windows-msvc-x64",
206+
"configuration": "Debug",
207+
"nativeToolOptions": [
208+
"-m"
209+
]
210+
},
211+
{
212+
"name": "windows-msvc-x64-static-release",
213+
"configurePreset": "windows-msvc-x64-static",
214+
"configuration": "Release",
215+
"nativeToolOptions": [
216+
"-m"
217+
]
218+
},
219+
{
220+
"name": "windows-msvc-x64-static-relWithDebInfo",
221+
"configurePreset": "windows-msvc-x64-static",
222+
"configuration": "RelWithDebInfo",
223+
"nativeToolOptions": [
224+
"-m"
225+
]
226+
},
227+
{
228+
"name": "windows-msvc-x64-static-debug",
229+
"configurePreset": "windows-msvc-x64-static",
230+
"configuration": "Debug",
231+
"nativeToolOptions": [
232+
"-m"
233+
]
234+
}
235+
]
236+
}

‎Docker/Dockerfile-ORE‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎Docker/Dockerfile-OREPlus‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)