Merge branch 'develop' into path_view_refactor

5 files changed, 39 insertions, 17 deletions

diff --git a/.ci.cmake b/.ci.cmake
index f9b28189..a6e3c82b 100644
--- a/.ci.cmake
+++ b/.ci.cmake
@@ -12,7 +12,7 @@ set(CTEST_GIT_COMMAND "${GIT_EXECUTABLE}")
 
 ctest_start("Experimental")
 ctest_update()
-ctest_configure(OPTIONS ${CTEST_CONFIGURE_OPTIONS})
+ctest_configure(OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE};${CTEST_CONFIGURE_OPTIONS})
 ctest_build(TARGET _dl)
 ctest_build(TARGET _sl)
 set(retval 0)
diff --git a/.travis.yml b/.travis.yml
index 9d80bbfa..1a34211b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,11 +79,17 @@ before_install:
  - git submodule update --init --recursive
  - mount
 
+ #      ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ;
+
 script:
  -
    if [ "$__" = "cmake tests" ] || [ "$__" = "x64 cmake tests (error_code)" ] || [ "$__" = "x64 cmake tests (status_code)" ]; then
      export ASAN_OPTIONS=detect_leaks=0;
-     ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ;
+     mkdir build;
+     cd build;
+     cmake ..  $CMAKE_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=Release;
+     cmake --build .;
+     ctest -C Release;
    fi
  -
    if [ "$__" = "ARM32 cmake tests (error_code)" ] || [ "$__" = "ARM32 cmake tests (status_code)" ]; then
@@ -111,7 +117,7 @@ script:
      cd programs;
      mkdir build;
      cd build;
-     cmake ..  $CMAKE_CONFIGURE_OPTIONS ;
+     cmake ..  $CMAKE_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=Release;
      cmake --build .;
    fi
  
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp
index 28402bcd..4c17f712 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    efb2cc2069d8b7fbad0ff43205ab5bbc73f7ce90
-#define LLFIO_PREVIOUS_COMMIT_DATE   "2019-10-07 10:23:15 +00:00"
-#define LLFIO_PREVIOUS_COMMIT_UNIQUE efb2cc20
+#define LLFIO_PREVIOUS_COMMIT_REF    8613f89fd6249cac815c7c1f1bdf3056c8478c3e
+#define LLFIO_PREVIOUS_COMMIT_DATE   "2019-10-08 21:00:32 +00:00"
+#define LLFIO_PREVIOUS_COMMIT_UNIQUE 8613f89f
diff --git a/include/llfio/v2.0/async_file_handle.hpp b/include/llfio/v2.0/async_file_handle.hpp
index 853afc8e..07f3a075 100644
--- a/include/llfio/v2.0/async_file_handle.hpp
+++ b/include/llfio/v2.0/async_file_handle.hpp
@@ -249,6 +249,10 @@ protected:
     dsync_async
   };
   struct _erased_completion_handler;
+#if defined(__clang__) && __clang_major__ >= 8
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdefaulted-function-deleted"
+#endif
   // Holds state for an i/o in progress. Will be subclassed with platform specific state and how to implement completion.
   struct _erased_io_state_type
   {
@@ -308,6 +312,9 @@ protected:
     _erased_io_state_type &operator=(_erased_io_state_type &&) = default;
     _erased_io_state_type &operator=(const _erased_io_state_type &) = default;
   };
+#if defined(__clang__) && __clang_major__ >= 8
+#pragma clang diagnostic pop
+#endif
   struct _io_state_deleter
   {
     template <class U> void operator()(U *_ptr) const
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 7e4f63bc..e9d73195 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -1,11 +1,29 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+include(../cmake/QuickCppLibBootstrap.cmake)
+include(QuickCppLibUtils)
 
+project(llfio-programs VERSION 1.0 LANGUAGES CXX)
+
+find_quickcpplib_library(quickcpplib
+  GIT_REPOSITORY "https://github.com/ned14/quickcpplib.git"
+  REQUIRED
+  IS_HEADER_ONLY
+)
+find_quickcpplib_library(outcome
+  GIT_REPOSITORY "https://github.com/ned14/outcome.git"
+  GIT_TAG "develop"
+  REQUIRED
+  IS_HEADER_ONLY
+)
+find_quickcpplib_library(kerneltest
+  GIT_REPOSITORY "https://github.com/ned14/kerneltest.git"
+  REQUIRED
+  IS_HEADER_ONLY
+)
 if(NOT TARGET llfio::hl)
   add_subdirectory(.. llfio EXCLUDE_FROM_ALL)
 endif()
 
-project(llfio-programs VERSION 1.0 LANGUAGES CXX)
-
 # Looks like cmake's toolset for LLVM-vs* has some serious problems
 if(CMAKE_GENERATOR_TOOLSET MATCHES "LLVM-vs.*")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi")
@@ -14,15 +32,6 @@ endif()
 
 function(make_program program)
   add_executable(${program} "${program}/main.cpp")
-  # Hack for sibling config
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../.quickcpplib_use_siblings")
-    target_include_directories(${program} PRIVATE "../..")
-    target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings")
-    target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings/a")
-    target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings/a/a")
-  else()
-    target_include_directories(${program} PRIVATE "../test")
-  endif()
   if(WIN32)
     target_compile_definitions(${program} PRIVATE _UNICODE UNICODE)
     # cmake's support for LLVM clang is shocking :(