From 040092f6344b1aec9a570f6a7f42461d95b725e6 Mon Sep 17 00:00:00 2001 From: Felix Petriconi Date: Wed, 10 Feb 2021 20:14:10 +0100 Subject: [PATCH] Fix #363 --- CHANGES.md | 19 ------------------- CMakeLists.txt | 4 ++-- conanfile.py | 30 +++++++++++++----------------- 3 files changed, 15 insertions(+), 38 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 04f5fbde1..c21fe5e77 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,22 +1,3 @@ -## v.1.6.2 - 2021 - March 25 - - Fixed issues - - [#371]:(https://github.com/stlab/libraries/issues/371)Missing include in concurrency/utility.hpp - - The _hold for detach was being done on the executor instead of the continuation. The result was a (silenced) broken exception getting thrown if detach() is called on a ready exception. - This would trigger an exception which is caught internally in a packaged task and dropped. - ```cpp - stlab::make_ready_future(stlab::immediate_executor).detach(); - ``` - - Fixed an issue with the serial queue using a "temporary" executor which was copied into the future shared state. - - Added stealing to blocking_get - - Also cleaned up blocking_get implementation. - - blocking_get_for() added - - Fix for make_exceptional_future and improvements blocking_get_for added - - deprecated blocking_get() with timeout - - Fixing bugs and naming our threads - - Fixed issue with backoff - - min() duration on a clock apparently is not a minimum length duration as documented, but is a negative duration... instead we us a single tick. - - Update utility.hpp - ## v.1.6.1 - 2021 - February 10 - Fixed issues - [#363]:(https://github.com/stlab/libraries/issues/363) Wrong version in the 1.6.0 release diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d9aae59f..35276ecc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ else() set( subproject OFF ) endif() -project( stlab VERSION 1.6.2 LANGUAGES CXX ) +project( stlab VERSION 1.6.1 LANGUAGES CXX ) # Overriden from Conan? # set(CMAKE_CXX_STANDARD 17) @@ -180,7 +180,7 @@ elseif (${stlab.task_system} STREQUAL "portable") elseif (${stlab.task_system} STREQUAL "libdispatch") target_compile_definitions( stlab INTERFACE -DSTLAB_FORCE_TASK_SYSTEM_LIBDISPATCH ) elseif (${stlab.task_system} STREQUAL "emscripten") - target_compile_definitions( stlab INTERFACE -DSTLAB_FORCE_TASK_SYSTEM_EMSCRIPTEN ) + target_compile_definitions( stlab INTERFACE -DSTLAB_FORCE_TASK_SYSTEM_EMSRIPTEN ) elseif (${stlab.task_system} STREQUAL "pnacl") target_compile_definitions( stlab INTERFACE -DSTLAB_FORCE_TASK_SYSTEM_PNACL ) elseif (${stlab.task_system} STREQUAL "windows") diff --git a/conanfile.py b/conanfile.py index 3e9896cab..2b764934b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -14,7 +14,7 @@ def option_on_off(option): class StlabLibrariesConan(ConanFile): name = "stlab" - version = "1.6.2" #TODO(fernando): see how to automate the version number + version = "1.6.1" #TODO(fernando): see how to automate the version number license = "http://www.boost.org/users/license.html" url = "https://github.com/stlab/libraries" description = "Software Technology Lab (stlab) libraries" @@ -172,6 +172,8 @@ def _configure_task_system(self): def configure(self): ConanFile.configure(self) + tools.check_min_cppstd(self, "14") + self._fix_boost_components() if self._use_boost(): @@ -184,28 +186,22 @@ def build(self): if self.options.testing: cmake = CMake(self) cmake.verbose = True - cmake.definitions["CMAKE_CXX_STANDARD"] = 14 - cmake.definitions["stlab.testing"] = option_on_off(self.options.testing) - cmake.definitions["stlab.coverage"] = option_on_off(self.options.coverage) - cmake.definitions["stlab.boost_variant"] = option_on_off(self.options.boost_variant) - cmake.definitions["stlab.boost_optional"] = option_on_off(self.options.boost_optional) - cmake.definitions["stlab.coroutines"] = option_on_off(self.options.coroutines) - cmake.definitions["stlab.task_system"] = self.options.task_system - - self.output.info("*********** BEFORE configure().") + if not self.settings.compiler.cppstd: + cmake.definitions["CMAKE_CXX_STANDARD"] = 17 + cmake.definitions["stlab.testing"] = option_on_off(self.options.testing) + cmake.definitions["stlab.coverage"] = option_on_off(self.options.coverage) + cmake.definitions["stlab.boost_variant"] = option_on_off(self.options.boost_variant) + cmake.definitions["stlab.boost_optional"] = option_on_off(self.options.boost_optional) + cmake.definitions["stlab.coroutines"] = option_on_off(self.options.coroutines) + cmake.definitions["stlab.task_system"] = self.options.task_system + cmake.configure() - self.output.info("*********** BEFORE build().") cmake.build() - self.output.info("*********** BEFORE test().") cmake.test(output_on_failure=True) - self.output.info("*********** AFTER test().") - + def package(self): self.copy("*.hpp") def imports(self): self.copy("*.dll", "./bin", "bin") self.copy("*.dylib", "./bin", "lib") - - def package_info(self): - self.cpp_info.includedirs = ['.']