File tree Expand file tree Collapse file tree 3 files changed +14
-9
lines changed
Expand file tree Collapse file tree 3 files changed +14
-9
lines changed Original file line number Diff line number Diff line change 99env :
1010 CTEST_OUTPUT_ON_FAILURE : ' 1'
1111 GTEST_OUTPUT : xml:${{ github.workspace }}/test-results/
12- boost_version : 1.80 .0
12+ boost_version : 1.83 .0
1313 cmake_common_args : >-
1414 -DCMAKE_FIND_ROOT_PATH=${{ github.workspace }}/dependencies
1515 -DCMAKE_PREFIX_PATH=${{ github.workspace }}/dependencies
1616 cores_count : ' 2'
1717 cores_mac_count : ' 3'
1818 dependency_location : " ${{ github.workspace }}/dependencies"
1919 gtest_version : release-1.12.1
20- msvc_version : 14.1
20+ msvc_version : 14.2
21+ msvc_toolset : 142
2122 test_results_location : " ${{ github.workspace }}/test-results"
2223jobs :
2324 Linux :
@@ -205,7 +206,7 @@ jobs:
205206 - name : Build gtest
206207 run : |-
207208 cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.dependency_location }} -Dgtest_force_shared_crt=ON `
208- -A ${{ matrix.arch }} -T v141 -DCMAKE_DEBUG_POSTFIX=d
209+ -A ${{ matrix.arch }} -T v${{ env.msvc_toolset }} -DCMAKE_DEBUG_POSTFIX=d
209210 cmake --build . --config Debug
210211 cmake --build . --config Debug --target install
211212 # Need to also install release build to find the debug version.
@@ -216,8 +217,8 @@ jobs:
216217 run : |-
217218 mkdir build
218219 cd build
219- cmake ${{ env.cmake_common_args }} ${{ matrix.cmake_args }} -A ${{ matrix.arch }} -T v141 `
220- ${{ github.workspace }}
220+ cmake ${{ env.cmake_common_args }} ${{ matrix.cmake_args }} -A ${{ matrix.arch }} `
221+ -T v${{ env.msvc_toolset }} ${{ github.workspace }}
221222 working-directory : " ${{ github.workspace }}"
222223 - name : Build debug
223224 run : cmake --build . --config Debug
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2016 Aaron Barany
2+ * Copyright 2016-2023 Aaron Barany
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
2626#endif
2727#endif
2828
29- #include < boost/filesystem.hpp>
29+ #include < boost/filesystem/path .hpp>
3030
3131#if MSL_GCC || MSL_CLANG
3232#pragma GCC diagnostic pop
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2016 Aaron Barany
2+ * Copyright 2016-2023 Aaron Barany
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
3030#pragma GCC diagnostic ignored "-Wunused-local-typedef"
3131#endif
3232
33+ #define BOOST_FILESYSTEM_NO_DEPRECATED 1
34+
3335#include < boost/algorithm/string/replace.hpp>
34- #include < boost/wave.hpp>
36+ #include < boost/wave/cpplexer/cpplexer_exceptions .hpp>
3537#include < boost/wave/cpplexer/cpp_lex_iterator.hpp>
38+ #include < boost/wave/cpp_context.hpp>
39+ #include < boost/wave/cpp_exceptions.hpp>
3640
3741#if MSL_MSC
3842#pragma warning(pop)
You can’t perform that action at this time.
0 commit comments