Skip to content

Commit 7f382e8

Browse files
damienbarkerjenkins
authored andcommitted
QPR-12214 update userguide
1 parent ebb88b5 commit 7f382e8

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

Docs/UserGuide/userguide.tex

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -606,11 +606,11 @@ \subsubsection{Boost}\label{sec:boost}
606606
\subsubsection*{Windows}
607607

608608
\begin{enumerate}
609-
\item Download the pre-compiled binaries for your MSVC version (e.g. MSVC-14.2 for MSVC2019) from \cite{boost-binaries}
609+
\item Download the pre-compiled binaries for your MSVC version (e.g. MSVC-14.3 for MSVC2022) from \cite{boost-binaries}
610610
%, any recent version should work
611611
\begin{itemize}
612-
\item 32-bit: \cite{boost-binaries}{\bs}VERSION{\bs}boost\_VERSION-msvc-14.2-32.exe{\bs}download
613-
\item 64-bit: \cite{boost-binaries}{\bs}VERSION{\bs}boost\_VERSION-msvc-14.2-64.exe{\bs}download
612+
\item 32-bit: \cite{boost-binaries}{\bs}VERSION{\bs}boost\_VERSION-msvc-14.3-32.exe{\bs}download
613+
\item 64-bit: \cite{boost-binaries}{\bs}VERSION{\bs}boost\_VERSION-msvc-14.3-64.exe{\bs}download
614614
\end{itemize}
615615
\item Start the installation file and choose an installation folder (the ``boost root directory''). Take a note of that folder as it will be needed later on.
616616
\item Finish the installation by clicking Next a couple of times.
@@ -621,19 +621,19 @@ \subsubsection*{Windows}
621621
\begin{enumerate}
622622
\item Open a Visual Studio Tools Command Prompt
623623
\begin{itemize}
624-
\item 32-bit: VS2019 x86 Native Tools Command Prompt
625-
\item 64-bit: VS2019 x64 Native Tools Command Prompt
624+
\item 32-bit: VS2022 x86 Native Tools Command Prompt
625+
\item 64-bit: VS2022 x64 Native Tools Command Prompt
626626
\end{itemize}
627627
\item Navigate to the boost root directory
628628
\item Run bootstrap.bat
629629
\item Build the libraries from the source code
630630
\begin{itemize}
631631
\item 32-bit: \\
632-
{\footnotesize\tt .{\bs}b2 --stagedir=.{\bs}lib{\bs}Win32{\bs}lib --build-type=complete toolset=msvc-14.0 \bs \\
632+
{\footnotesize\tt .{\bs}b2 --stagedir=.{\bs}lib{\bs}Win32{\bs}lib --build-type=complete toolset=msvc-14.3 \bs \\
633633
address-model=32 --with-test --with-system --with-filesystem \bs \\
634634
--with-serialization --with-regex --with-date\_time stage}
635635
\item 64-bit: \\
636-
{\footnotesize\tt .{\bs}b2 --stagedir=.{\bs}lib{\bs}x64{\bs}lib --build-type=complete toolset=msvc-14.0 \bs \\
636+
{\footnotesize\tt .{\bs}b2 --stagedir=.{\bs}lib{\bs}x64{\bs}lib --build-type=complete toolset=msvc-14.3 \bs \\
637637
address-model=64 --with-test --with-system --with-filesystem \bs \\
638638
--with-serialization --with-regex --with-date\_time stage}
639639
\end{itemize}
@@ -653,7 +653,7 @@ \subsubsection*{Windows}
653653

654654
\begin{enumerate}
655655

656-
\item Download and install Visual Studio Community Edition (Version 2017 or later).
656+
\item Download and install Visual Studio Community Edition (Version 2019 or later, 2022 is recommended).
657657
During the installation, make sure you install the Visual
658658
C++ support under the Programming Languages features (disabled by default).
659659

@@ -662,8 +662,8 @@ \subsubsection*{Windows}
662662
Set environment variables, e.g.:
663663
\begin{itemize}
664664
\item {\tt \%BOOST\%} pointing to your directory, e.g, {\tt C:{\bs}boost\_1\_72\_0}
665-
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib32\-msvc\-14.2}
666-
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib64\-msvc\-14.2}
665+
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib32\-msvc\-14.3}
666+
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib64\-msvc\-14.3}
667667
\end{itemize}
668668

669669
\item Download and install CMake for Windows (https://cmake.org/download/). Visual Studio Community Edition 2019 or later supports CMake and you can install the feature 'C++ CMake Tools for Windows' instead of installing CMake as standalone program.
@@ -672,18 +672,18 @@ \subsubsection*{Windows}
672672

673673
%\subsubsection*{Visual Studio with CMake}
674674

675-
From Visual Studio 2015 and later supports CMake Projects.
675+
Visual Studio 2019 and later supports CMake Projects.
676676

677677
\begin{enumerate}
678-
\item Start Visual Studio 2017 or later.
678+
\item Start Visual Studio 2019 or later.
679679
\item Select "Open a local folder" from the start page or menu.
680680
\item In the dialog window, select the ORE root directory.
681681
\item Visual Studio will read the cmake presets from CMakePresets.json and the project file CMakeList.txt and configure the project.
682682
\item Once the configuration is finished and one can build the project.
683683
\item The executables are built in the subfolder {\tt /build/TARGET/CONFIGURATION/EXECUTABLE}, e.g. {\tt /build/App/Release/ore.exe}.
684684
\end{enumerate}
685685

686-
ORE is shipped with configuration and build presets using Visual Studio 2022 and the Ninja build system. Those presets are configured in the CMakePreset.json which is read by Visual Studio by default when opening the CMake project. If you want to use Visual Studio 2019 or Visual Studio 2017 instead, you would have to change the Generator in the CMakePreset.json from "Visual Studio 17 2022" to "Visual Studio 16 2019" or "Visual Studio 15 2017".
686+
ORE is shipped with configuration and build presets using Visual Studio 2022 and the Ninja build system. Those presets are configured in the CMakePreset.json which is read by Visual Studio by default when opening the CMake project. If you want to use Visual Studio 2019 instead, you would have to change the Generator in the CMakePreset.json from "Visual Studio 17 2022" to "Visual Studio 16 2019".
687687

688688
You can switch in the solution explorer from the file view to the projects view, where the CMake Targets View can be selected. In this view, the various target projects can be seen below "ORE Project" and be used in a similar manner as the usual VS projects.
689689

@@ -883,7 +883,7 @@ \subsection{Building ORE-SWIG and Python Wheels}\label{sec:oreswig}
883883
%
884884
%{\footnotesize
885885
%{\tt mkdir build $\backslash$} \\
886-
%{\tt cmake -G "Visual Studio 15 2017" $\backslash$}\\
886+
%{\tt cmake -G "Visual Studio 17 2022" $\backslash$}\\
887887
%\hspace{1cm} {\tt -A x64 $\backslash$}\\
888888
%\hspace{1cm} {\tt -D SWIG\_DIR=C:$\backslash$dev$\backslash$swigwin$\backslash$Lib $\backslash$}\\
889889
%\hspace{1cm} {\tt -D SWIG\_EXECUTABLE=C:$\backslash$dev$\backslash$swigwin$\backslash$swig.exe $\backslash$}\\

0 commit comments

Comments
 (0)