diff options
author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-06-07 18:12:24 +0300 |
---|---|---|
committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-06-07 18:12:24 +0300 |
commit | a36490c2e5cfdeedb65bf82bed40e3de28caf557 (patch) | |
tree | 5f51670bb079df5448c0990bd7a0a6449d4327a0 | |
parent | 0eb47d30299b63748a2796a9439e53765a5ff101 (diff) |
Now fully compiling with experimental SG14 status_code.
-rw-r--r-- | CMakeLists.txt | 42 | ||||
-rw-r--r-- | include/afio/revision.hpp | 6 | ||||
m--------- | include/afio/v2.0/outcome | 0 | ||||
m--------- | test/kerneltest | 0 | ||||
-rw-r--r-- | test/test_kernel_decl.hpp | 3 |
5 files changed, 48 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 34e66e7b..6c4259a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,48 @@ include(QuickCppLibMakeLibrary) # Make an interface only library so dependent CMakeLists can bring in this header-only library include(QuickCppLibMakeHeaderOnlyLibrary) +# Make preprocessed edition of this library target +if(NOT PROJECT_IS_DEPENDENCY) + if(NOT PYTHONINTERP_FOUND) + indented_message(WARNING "NOT rebuilding preprocessed edition of library due to python not being installed") + else() + # See if the ply package is installed so pcpp can run + execute_process(COMMAND python -c "import ply" RESULT_VARIABLE python_has_ply) + if(NOT python_has_ply EQUAL 0) + indented_message(WARNING "NOT rebuilding preprocessed edition of library due to installed python not having the ply package installed. " + "Do 'pip install ply' to fix. NOTE that doxygen docs will NOT build without the precompiled edition.") + else() + function(make_single_header target name) + add_partial_preprocess(${target} + "${name}" + ${ARGN} + -I .. + --passthru-defines --passthru-unfound-includes --passthru-unknown-exprs + --passthru-comments --line-directive # --debug + -U QUICKCPPLIB_ENABLE_VALGRIND + -U DOXYGEN_SHOULD_SKIP_THIS -U DOXYGEN_IS_IN_THE_HOUSE + -U STANDARDESE_IS_IN_THE_HOUSE + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + if(NOT CMAKE_VERSION VERSION_LESS 3.3) + add_dependencies(outcome_hl ${target}) + endif() + endfunction() + make_single_header(afio_hl-pp-std + "${CMAKE_CURRENT_SOURCE_DIR}/single-header/afio.hpp" + "${CMAKE_CURRENT_SOURCE_DIR}/include/afio/v2.0/afio.hpp") + make_single_header(afio_hl-pp-abi + "${CMAKE_CURRENT_SOURCE_DIR}/single-header/abi.hpp" + "${CMAKE_CURRENT_SOURCE_DIR}/include/afio/v2.0/afio.hpp" + -D AFIO_DISABLE_ABI_PERMUTATION=1 + -D OUTCOME_DISABLE_ABI_PERMUTATION=1 + -D QUICKCPPLIB_DISABLE_ABI_PERMUTATION=1 + -U AFIO_UNSTABLE_VERSION + -U OUTCOME_UNSTABLE_VERSION) + endif() + endif() +endif() + # Create a custom doxygen generation target include(QuickCppLibMakeDoxygen) # Set the standard definitions for these libraries and bring in the all_* helper functions diff --git a/include/afio/revision.hpp b/include/afio/revision.hpp index 0f8100d6..d2c58e2e 100644 --- a/include/afio/revision.hpp +++ b/include/afio/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 AFIO_PREVIOUS_COMMIT_REF 9d2321f2d4ea7076159d984fcf734a415cc9bdd1 -#define AFIO_PREVIOUS_COMMIT_DATE "2018-06-01 18:39:21 +00:00" -#define AFIO_PREVIOUS_COMMIT_UNIQUE 9d2321f2 +#define AFIO_PREVIOUS_COMMIT_REF 0eb47d30299b63748a2796a9439e53765a5ff101 +#define AFIO_PREVIOUS_COMMIT_DATE "2018-06-07 09:05:56 +00:00" +#define AFIO_PREVIOUS_COMMIT_UNIQUE 0eb47d30 diff --git a/include/afio/v2.0/outcome b/include/afio/v2.0/outcome -Subproject 46497538f4113d1e3726f20c9510d4e5b1a9456 +Subproject a4fe32179a63d727422c17225e3fbd26fcc616c diff --git a/test/kerneltest b/test/kerneltest -Subproject 1163c652fdc6e03d08716e5452771cd3eb8dcb8 +Subproject 7dce886c4ed4501d43886a97e44f9ff94e13a99 diff --git a/test/test_kernel_decl.hpp b/test/test_kernel_decl.hpp index 3c7f2173..b1ec993c 100644 --- a/test/test_kernel_decl.hpp +++ b/test/test_kernel_decl.hpp @@ -34,6 +34,9 @@ Distributed under the Boost Software License, Version 1.0. #define AFIO_TEST_KERNEL_DECL extern inline QUICKCPPLIB_SYMBOL_EXPORT #endif +#if AFIO_EXPERIMENTAL_STATUS_CODE +#define KERNELTEST_EXPERIMENTAL_STATUS_CODE 1 +#endif #include "kerneltest/include/kerneltest.hpp" #if 0 |