Skip to content

Commit d4cbad3

Browse files
Merge branch 'QPR-12015' into 'master'
QPR-12015 support QL_ENABLE_SESSION with unix Closes QPR-12015 See merge request qs/oreswig!39
2 parents 8b1751e + e4c3d1c commit d4cbad3

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

OREAnalytics-SWIG/Python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ get_library_name("QuantExt" QLE_LIB_NAME)
3535
set_ql_library_name()
3636

3737
# To build the module, we moreover need Boost, Swig, Python
38-
set(BOOST_COMPONENT_LIST serialization date_time regex filesystem system timer thread)
38+
set(BOOST_COMPONENT_LIST serialization date_time regex filesystem system timer thread log)
3939
if(ORE_USE_ZLIB)
4040
list(APPEND BOOST_COMPONENT_LIST iostreams)
4141
if(MSVC)

OREAnalytics-SWIG/oreanalytics-config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ while test $# -gt 0; do
2121

2222
case $1 in
2323
--cflags)
24-
echo -I${ORE}/OREAnalytics -I${ORE}/OREData -I${ORE}/QuantExt -I${ORE}/QuantLib -I${BOOST_INC} -std=c++1z
24+
echo -I${ORE}/build/QuantLib -I${ORE}/OREAnalytics -I${ORE}/OREData -I${ORE}/QuantExt -I${ORE}/QuantLib -I${BOOST_INC} -std=c++1z
2525
;;
2626
--libs)
2727
echo -L${ORE}/build/OREAnalytics/orea -lOREAnalytics -L${ORE}/build/OREData/ored -lOREData -L${ORE}/build/QuantExt/qle -lQuantExt -L${ORE}/build/QuantLib/ql -lQuantLib -L${BOOST_LIB} -l${BOOST_THREAD} -lboost_system -lboost_serialization -lboost_date_time -lboost_regex -lboost_filesystem -std=c++1z

tutorials.03.build_windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ and, when running cmake, you can omit flag `-DORE_USE_ZLIB=ON`.
6666
SET BOOST_INCLUDEDIR=%DEMO_BOOST_ROOT%
6767
SET BOOST_LIBRARYDIR=%DEMO_BOOST_LIB%
6868
SET ZLIB_ROOT=%DEMO_ZLIB_ROOT%
69-
cmake -G "Visual Studio 17 2022" -A x64 .. -DMSVC_LINK_DYNAMIC_RUNTIME=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DCMAKE_BUILD_TYPE=Release -DORE_USE_ZLIB=ON
69+
cmake -G "Visual Studio 17 2022" -A x64 .. -DMSVC_LINK_DYNAMIC_RUNTIME=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DCMAKE_BUILD_TYPE=Release -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON
7070

7171
## Build ORE
7272

tutorials.04.build_posix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ and, when running cmake, you can omit flag `-DORE_USE_ZLIB=ON`.
5757
export BOOST_INCLUDEDIR=$DEMO_BOOST_INC
5858
export BOOST_LIBRARYDIR=$DEMO_BOOST_LIB
5959
export ZLIB_ROOT=%DEMO_ZLIB_ROOT%
60-
cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DBoost_NO_WARN_NEW_VERSIONS=1 -DBoost_NO_SYSTEM_PATHS=1 -DORE_USE_ZLIB=ON
60+
cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DBoost_NO_WARN_NEW_VERSIONS=1 -DBoost_NO_SYSTEM_PATHS=1 -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON
6161

6262
## Build ORE
6363

0 commit comments

Comments
 (0)