Skip to content

Commit 78c21de

Browse files
mgronckijenkins
authored andcommitted
undo doc
1 parent 64d8189 commit 78c21de

1 file changed

Lines changed: 2 additions & 51 deletions

File tree

Docs/UserGuide/userguide.tex

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -658,47 +658,6 @@ \subsubsection*{Windows}
658658
\item Open the {\tt oreEverything\_*.sln} and build the entire solution (again, make sure to select the correct platform in the configuration manager first).
659659
\end{enumerate}
660660

661-
\subsubsection*{Generate Visual Studio Projects with CMake}
662-
663-
ORE 1.8.9 and later will be shipped without the Visual Studio project and solution files. The Visual Studio projects can be auto-generated from the CMake project files.
664-
665-
\begin{enumerate}
666-
667-
\item Download and install Visual Studio Community Edition (Version 2013 or later).
668-
During the installation, make sure you install the Visual
669-
C++ support under the Programming Languages features (disabled by default).
670-
671-
\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-
673-
\item Set environment variables: \\
674-
\begin{itemize}
675-
\item {\tt \%BOOST\%} pointing to your directory, e.g, {\tt C:{\bs}boost\_1\_72\_0}
676-
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib32\-msvc\-14.0}
677-
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib64\-msvc\-14.0}
678-
\end{itemize}
679-
680-
\item Generate MSVC project files from CMake files:
681-
\begin{itemize}
682-
\item Open a Visual Studio Tools Command Prompt
683-
\begin{itemize}
684-
\item 32-bit: VS2022/x86 Native Tools Command Prompt for VS 2022
685-
\item 64-bit: VS2022/x64 Native Tools Command Prompt for VS 2022
686-
\end{itemize}
687-
\item Navigate to the ORE root directory
688-
\item Run CMake command:
689-
\begin{itemize}
690-
\item 32-bit: \\
691-
{\tt cmake -G "Visual Studio 17 2022" -A x64 -DBOOST\_INCLUDEDIR=\%BOOST\% -DBOOST\_LIBRARYDIR=\%BOOST\_LIB64\% -DMSVC\_LINK\_DYNAMIC\_RUNTIME=true -B build}
692-
\item 64-bit: \\
693-
{\tt cmake -G "Visual Studio 17 2022" -A x32 -DBOOST\_INCLUDEDIR=\%BOOST\% -DBOOST\_LIBRARYDIR=\%BOOST\_LIB32\% -DMSVC\_LINK\_DYNAMIC\_RUNTIME=true -B build}
694-
\end{itemize}
695-
Replace the generator "Visual Studio 17 2022" with the actual installed version.
696-
The solution and project files will be generated in the {\tt $\langle$ORE\_ROOT$\rangle${\bs}build} subdirectory.
697-
\end{itemize}
698-
699-
\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).
700-
\end{enumerate}
701-
702661
\subsubsection*{Unix}
703662

704663
With the 5th release we have discontinued automake support so that ORE can only be built with CMake on Unix systems, as follows.
@@ -755,14 +714,7 @@ \subsubsection*{Building on Windows with CMake}
755714
One advantage of the CMake build system is that it covers both Unix and Windows builds.
756715
The same set of {\tt CMakeLists.txt} files as above allows building ORE on Windows. The following instructions use the {\tt Ninja} build system ({\url{ninja-build.org}) that covers the role of {\tt make} on Unix systems and calls the Visual Studio C++ compiler and linker.
757716

758-
759717
\begin{enumerate}
760-
\item Set environment variables: \\
761-
\begin{itemize}
762-
\item {\tt \%BOOST\%} pointing to your directory, e.g, {\tt C:{\bs}boost\_1\_72\_0}
763-
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib32\-msvc\-14.0}
764-
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib64\-msvc\-14.0}
765-
\end{itemize}
766718
\item Open a command prompt, change to directory C:{\textbackslash}Program Files (x86){\textbackslash}Microsoft Visual Studio 14.0{\textbackslash}VC and run\\
767719
\medskip
768720
{\tt vcvarsall.bat x64} \\
@@ -771,10 +723,9 @@ \subsubsection*{Building on Windows with CMake}
771723
\item Change to the ORE project directory that contains the {\tt QuantLib}, {\tt QuantExt}, etc, folders; create subdirectory {\tt build} and change to subdirectory {\tt build}
772724
\item Configure CMake e.g. by invoking \\
773725
\medskip
774-
{\tt cmake -D BOOST\_INCLUDEDIR=\%BOOST\% } \textbackslash\\
775-
{\tt \hspace{2cm} -D BOOST\_LIBRARYDIR=\%BOOST\_LIB64\% }\textbackslash\\
726+
{\tt cmake -D BOOST\_LIBRARYDIR=/path/to/boost/root/lib64-msvc-14.0 } \textbackslash\\
776727
{\tt \hspace{2cm} -D CMAKE\_BUILD\_TYPE=Release }\textbackslash\\
777-
{\tt \hspace{2cm} -D MSVC\_LINK\_DYNAMIC\_RUNTIME=true} \textbackslash\\
728+
{\tt \hspace{2cm} -D MSVC\_RUNTIME=static} \textbackslash\\
778729
{\tt \hspace{2cm} -G Ninja ..} \\
779730
\medskip
780731
where the -G option allows choosing the desired build system generator.

0 commit comments

Comments
 (0)