diff options
| -rw-r--r-- | CMakeLists.txt | 28 | ||||
| m--------- | include/boost/afio/boost-lite | 0 | ||||
| m--------- | include/boost/afio/gsl-lite | 0 | ||||
| m--------- | include/boost/afio/outcome | 0 | ||||
| -rw-r--r-- | include/boost/afio/revision.hpp | 4 | ||||
| -rw-r--r-- | include/boost/afio/v2.0/config.hpp | 11 | ||||
| m--------- | test/kerneltest | 0 | ||||
| -rw-r--r-- | test/test_kernel_decl.hpp | 2 | ||||
| -rw-r--r-- | test/tests/file_handle_create_close/runner.cpp | 1 |
9 files changed, 30 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5549dde3..97e81244 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR) # Bring in the Boost lite cmake tooling set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/boost-lite/cmake") include(BoostLiteRequireOutOfSourceBuild) -include(BoostLiteHppUtils) # for ParseProjectVersionFromHpp and UpdateRevisionHppFromGit +include(BoostLiteUtils) # for ParseProjectVersionFromHpp and UpdateRevisionHppFromGit # Parse the version we tell cmake directly from the version header file ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/version.hpp" VERSIONSTRING) @@ -25,19 +25,25 @@ include(BoostLiteMakeHeaderOnlyLibrary) include(BoostLiteApplyDefaultDefinitions) # Set the C++ features this library requires all_compile_features(PUBLIC - # cxx_exceptions ## Annoyingly not supported by cmake 3.4 - cxx_alias_templates - cxx_variadic_templates - cxx_noexcept - cxx_constexpr - cxx_thread_local - #cxx_init_captures ## Not supported yet by cmake 3.4 - cxx_attributes - cxx_variable_templates - ) + # cxx_exceptions ## Annoyingly not supported by cmake 3.4 + cxx_alias_templates + cxx_variadic_templates + cxx_noexcept + cxx_constexpr + cxx_thread_local + #cxx_init_captures ## Not supported yet by cmake 3.4 + cxx_attributes + cxx_variable_templates +) +# Set any macros this library requires +if(WIN32) + all_compile_definitions(PRIVATE _WIN32_WINNT=0x600) ## Target WinVista +endif() # Anyone using the static or dynamic libraries is not using the header only variant foreach(lib afio_sl afio_dl) target_compile_definitions(${lib} INTERFACE BOOST_AFIO_HEADERS_ONLY=0) endforeach() +# For all possible configurations of this library, add each test +include(BoostLiteMakeStandardTests) diff --git a/include/boost/afio/boost-lite b/include/boost/afio/boost-lite -Subproject 16f8cb281d2c91ea72cff5da0fe866d28f391e2 +Subproject a9676782d02f90165d4cf717c013f83b8006cee diff --git a/include/boost/afio/gsl-lite b/include/boost/afio/gsl-lite -Subproject 8044a245a215bc390db24e9a3819ad2d50be7de +Subproject 512bb3563bf4d448cfdf0610ce8f52aebcfcab6 diff --git a/include/boost/afio/outcome b/include/boost/afio/outcome -Subproject 44310e2608f1cdc4a7acacf1925e1a9e0cf1c3f +Subproject 3a3cc0321e0d3418619c54e1957bc3ec370b7d2 diff --git a/include/boost/afio/revision.hpp b/include/boost/afio/revision.hpp index aaab9163..f152b611 100644 --- a/include/boost/afio/revision.hpp +++ b/include/boost/afio/revision.hpp @@ -1,3 +1,3 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define BOOST_AFIO_PREVIOUS_COMMIT_REF cfd6b087cc84fea7793905f5ff4b1e1576bc0486 -#define BOOST_AFIO_PREVIOUS_COMMIT_DATE "2016-07-09 13:50:41 +00:00" +#define BOOST_AFIO_PREVIOUS_COMMIT_REF b1d25e3021caa6085ad14e51f4704ef2966ca587 +#define BOOST_AFIO_PREVIOUS_COMMIT_DATE "2016-07-09 13:52:20 +00:00" diff --git a/include/boost/afio/v2.0/config.hpp b/include/boost/afio/v2.0/config.hpp index 6c8773a7..8941d07c 100644 --- a/include/boost/afio/v2.0/config.hpp +++ b/include/boost/afio/v2.0/config.hpp @@ -156,9 +156,14 @@ DEALINGS IN THE SOFTWARE. #define BOOST_AFIO_USE_BOOST_THREAD 0 #endif #endif -// Default to the C++ 11 STL if on MSVC (Dinkumware ships a copy), else Boost +// Default to the C++ 11 STL if on VS2015 or has <experimental/filesystem> #ifndef BOOST_AFIO_USE_BOOST_FILESYSTEM -#if _MSC_VER >= 1900 // >= VS 14 +#ifdef __has_include +#if __has_include(<experimental/filesystem>) +#define BOOST_AFIO_USE_BOOST_FILESYSTEM 0 +#endif +#endif +#if !defined(BOOST_AFIO_USE_BOOST_FILESYSTEM) && _MSC_VER >= 1900 /* >= VS2015 */ #define BOOST_AFIO_USE_BOOST_FILESYSTEM 0 #endif #endif @@ -737,6 +742,7 @@ namespace win BOOST_AFIO_V2_NAMESPACE_END +#if 0 /////////////////////////////////////////////////////////////////////////////// // Auto library naming #if !defined(BOOST_AFIO_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_AFIO_NO_LIB) && !AFIO_STANDALONE && !BOOST_AFIO_HEADERS_ONLY @@ -751,6 +757,7 @@ BOOST_AFIO_V2_NAMESPACE_END #include <boost/config/auto_link.hpp> #endif // auto-linking disabled +#endif //#define BOOST_THREAD_VERSION 4 //#define BOOST_THREAD_PROVIDES_VARIADIC_THREAD diff --git a/test/kerneltest b/test/kerneltest -Subproject fa26d65959ca55c01a56236e69ea17567bcf83e +Subproject a3c474389854a25a4d5bfd45c02ee77005ca69d diff --git a/test/test_kernel_decl.hpp b/test/test_kernel_decl.hpp index 86f1f9cc..a4b338ef 100644 --- a/test/test_kernel_decl.hpp +++ b/test/test_kernel_decl.hpp @@ -11,7 +11,7 @@ Created: May 2016 #define BOOST_AFIO_TEST_KERNEL_DECL inline #else // We are standalone -#include "../include/boost/afio/afio.hpp" +#include "boost/afio/afio.hpp" #define BOOST_AFIO_TEST_KERNEL_DECL extern BOOST_SYMBOL_EXPORT #endif diff --git a/test/tests/file_handle_create_close/runner.cpp b/test/tests/file_handle_create_close/runner.cpp index ef85c9f9..dd83b9e4 100644 --- a/test/tests/file_handle_create_close/runner.cpp +++ b/test/tests/file_handle_create_close/runner.cpp @@ -3,6 +3,7 @@ File Created: Apr 2016 */ +#include "boost/afio/afio.hpp" #include "../../kerneltest/include/boost/kerneltest/v1/hooks/filesystem_workspace.hpp" #include "../../kerneltest/include/boost/kerneltest/v1/permute_parameters.hpp" #include "../../kerneltest/include/boost/kerneltest/v1/test_kernel.hpp" |