diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-02-26 14:00:03 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-02-26 14:00:03 +0300 |
| commit | 6a1741fb75cb38d26933e8ee0bfa1eb6bb14f561 (patch) | |
| tree | 43c6ecd3fb8a42f1c8d3648f08819a8516fd2f0d | |
| parent | 1d97a5de10426b445a7ace2ea0e039c8a6c06ee3 (diff) | |
Fix all remaining PCH introduced build issues.
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cmake/interface.cmake | 5 | ||||
| -rw-r--r-- | include/llfio/revision.hpp | 6 | ||||
| -rw-r--r-- | include/llfio/v2.0/file_handle.hpp | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 341095c7..461ca9a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # LLFIO cmake -# (C) 2016-2019 Niall Douglas <http://www.nedproductions.biz/> +# (C) 2016-2020 Niall Douglas <http://www.nedproductions.biz/> # File Created: June 2016 # # @@ -21,7 +21,7 @@ # (See accompanying file Licence.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.3 FATAL_ERROR) include(cmake/QuickCppLibBootstrap.cmake) include(QuickCppLibRequireOutOfSourceBuild) include(QuickCppLibUtils) @@ -89,6 +89,7 @@ if(NOT PROJECT_IS_DEPENDENCY) function(make_single_header target name) add_partial_preprocess(${target} "${name}" + "${CMAKE_CURRENT_SOURCE_DIR}/include/llfio/revision.hpp" ${ARGN} -I .. --passthru-defines --passthru-unfound-includes --passthru-unknown-exprs @@ -234,6 +235,11 @@ endif() if(NOT PROJECT_IS_DEPENDENCY) # For all possible configurations of this library, add each test + set(llfio_TESTS_DISABLE_PRECOMPILE_HEADERS + "llfio_hl--coroutines" + "llfio_sl--coroutines" + "llfio_dl--coroutines" + ) include(QuickCppLibMakeStandardTests) # For each test target, set definitions and linkage foreach(target ${llfio_COMPILE_TEST_TARGETS} ${llfio_TEST_TARGETS}) diff --git a/cmake/interface.cmake b/cmake/interface.cmake index 47a638c1..4e558106 100644 --- a/cmake/interface.cmake +++ b/cmake/interface.cmake @@ -1,4 +1,7 @@ # DO NOT EDIT, GENERATED BY SCRIPT set(llfio_INTERFACE - "llfio/llfio.hpp" + "include/llfio.hpp" +) +# DO NOT EDIT, GENERATED BY SCRIPT +set(llfio_INTERFACE_SOURCE ) diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 554672fa..b50c92da 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define LLFIO_PREVIOUS_COMMIT_REF 5cceb1a49dce9d6daf619890c888ed3c10f48816 -#define LLFIO_PREVIOUS_COMMIT_DATE "2020-02-18 11:13:36 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE 5cceb1a4 +#define LLFIO_PREVIOUS_COMMIT_REF 1d97a5de10426b445a7ace2ea0e039c8a6c06ee3 +#define LLFIO_PREVIOUS_COMMIT_DATE "2020-02-25 10:42:28 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 1d97a5de diff --git a/include/llfio/v2.0/file_handle.hpp b/include/llfio/v2.0/file_handle.hpp index 4f6c8a97..dade453d 100644 --- a/include/llfio/v2.0/file_handle.hpp +++ b/include/llfio/v2.0/file_handle.hpp @@ -241,7 +241,7 @@ public: \mallocs On POSIX if changing the mode, we must loop calling `current_path()` and trying to open the path returned. Thus many allocations may occur. */ - result<file_handle> reopen(mode mode_ = mode::unchanged, caching caching_ = caching::unchanged, deadline d = std::chrono::seconds(30)) const noexcept; + LLFIO_HEADERS_ONLY_MEMFUNC_SPEC result<file_handle> reopen(mode mode_ = mode::unchanged, caching caching_ = caching::unchanged, deadline d = std::chrono::seconds(30)) const noexcept; LLFIO_DEADLINE_TRY_FOR_UNTIL(reopen) |