update cmake project and userguide

Author: mgroncki

CMakeLists.txt

@@ -10,7 +10,7 @@ option(ORE_BUILD_DOC "Build documentation" ON)
 option(ORE_BUILD_EXAMPLES "Build examples" ON)
 option(ORE_BUILD_TESTS "Build test suite" ON)
 option(ORE_BUILD_APP "Build app" ON)
-option(ORE_USE_ZLIB "Use compression for boost::iostreams" ON)
+option(ORE_USE_ZLIB "Use compression for boost::iostreams" OFF)
 
 include(CTest)
 

CMakePresets.json

@@ -16,7 +16,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
-        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        "ENABLE_SESSIONS": true,
       },
       "architecture": {
         "value": "x64",
@@ -46,6 +46,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": false,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
+        "ENABLE_SESSIONS": true,
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
       },
       "architecture": {
@@ -73,6 +74,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
+        "ENABLE_SESSIONS": true,
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
       },
       "architecture": {
@@ -100,6 +102,7 @@
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": false,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
+        "ENABLE_SESSIONS": true,
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
       },
       "architecture": {

Docs/UserGuide/userguide.tex

@@ -718,7 +718,9 @@ \subsubsection*{Generate Visual Studio Projects with CMake}
 The solution and project files will be generated in the {\tt $\langle$ORE\_ROOT$\rangle${\bs}build} subdirectory.
 \end{itemize}
 
-\item Open the {\tt build{\bs}ORE.sln} and build the entire solution (again, make sure to select the correct platform in the configuration manager first).
+\item build the cmake project with the command {\tt cmake --build build -v --config Release}, 
+
+\item or open the MSVC solution file {\tt build{\bs}ORE.sln} and build the entire solution with Visual Studio (again, make sure to select the correct platform in the configuration manager first).
 \end{enumerate}
 
 \subsubsection*{Unix}
@@ -1009,7 +1011,7 @@ \subsubsection*{Build ORE-SWIG Wrapper and Wheel}
 \item the Python module and static library in folder {\tt <PATH>{\bs}build{\bs}lib.win-amd64-cpython-310} (the directory name depends on the machine and python version)
 \item the wheel file (filename.whl) in folder {\tt <PATH>{\bs}dist}
 \end{itemize}
-where {\tt <PATH>} stands for {\tt \%ORESWIG\%{\bs}OREAnalytics-SWIG{\bs}Python}.
+where {\tt <PATH>} stands for {\tt \%ORESWIG\%{\bs}OREAnalytics-SWIG{\bs}Python}.
 
 \medskip
 To use the wrapper directly: \\

runCmakeVS.cmd

@@ -1,5 +1,5 @@
 mkdir build
-rem amend the BOOST variables to your environment, the MSVC_RUNTIME=static is needed to avoid inclusion of 3 MSVC DLLs in deployment: msvcp<version>.dll, vcruntime<version>.dll and vcruntime<version>_1.dll
-cmake -G "Visual Studio 16 2019" -A x64 -DBOOST_LIBRARYDIR=C:\dev\boost\lib -DBOOST_ROOT=C:\dev\boost -DBOOST_INCLUDE_DIR=C:\dev\boost -DMSVC_RUNTIME=static -B build
+rem amend the BOOST variables to your environment
+cmake -G "Visual Studio 17 2022" -A x64 -DBOOST_INCLUDEDIR=%BOOST% -DBOOST_LIBRARYDIR=%BOOST_LIB64% -DENABLE_SESSIONS=ON -B build
 cmake --build build -v --config Release
 pause