Skip to content

Commit a34c227

Browse files
committed
reverted Boost Version change in doc and CMakeLists.txt
1 parent 74f4683 commit a34c227

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

Docs/UserGuide/userguide.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ \subsubsection*{Windows}
661661

662662
Set environment variables, e.g.:
663663
\begin{itemize}
664-
\item {\tt \%BOOST\%} pointing to your directory, e.g, {\tt C:{\bs}boost\_1\_78\_0}
665-
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_78\_0{\bs}lib32\-msvc\-14.2}
666-
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_78\_0{\bs}lib64\-msvc\-14.2}
664+
\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}
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.

OREAnalytics/test/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ target_link_libraries(orea-test-suite ${ORED_LIB_NAME})
3232
target_link_libraries(orea-test-suite ${OREA_LIB_NAME})
3333
target_link_libraries(orea-test-suite ${Boost_LIBRARIES} ${RT_LIBRARY})
3434

35-
# avoid ABI mismatch between boost.log (either pre-built or later than 1_73) and this compiler run...
36-
target_compile_definitions(orea-test-suite PUBLIC BOOST_USE_WINAPI_VERSION=0x0600)
37-
3835
add_test(NAME orea-test-suite WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAND orea-test-suite -- --base_data_path=.)
3936

4037
install(TARGETS orea-test-suite

0 commit comments

Comments
 (0)