From 66c8b092620e801be1f855ef8edfdb1c0d96b183 Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Thu, 1 Aug 2024 11:42:10 -0600 Subject: [PATCH] Recipe improvements. (#90) --- CMakeLists.txt | 2 -- conanfile.py | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a86f8dc..3cface7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,7 @@ if(CCACHE_FOUND) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) endif () -if(BUILD_TESTING) enable_testing() -endif() add_subdirectory(src/) diff --git a/conanfile.py b/conanfile.py index f82226f..14abffc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class IOMgrConan(ConanFile): name = "iomgr" - version = "11.3.6" + version = "11.3.7" homepage = "https://github.com/eBay/IOManager" description = "Asynchronous event manager" @@ -27,7 +27,6 @@ class IOMgrConan(ConanFile): "testing" : ['full', 'off', 'epoll_mode', 'spdk_mode'], "grpc_support": ['True', 'False'], "spdk": ['True', 'False'], - "fiber_impl" : ['boost', 'folly'] } default_options = { 'shared': False, @@ -37,7 +36,6 @@ class IOMgrConan(ConanFile): 'sanitize': False, 'testing': 'epoll_mode', 'spdk': True, - 'fiber_impl': 'boost', } exports_sources = "CMakeLists.txt", "cmake/*", "src/*", "test/*", "LICENSE" @@ -104,8 +102,6 @@ def generate(self): self._download_grpc(self.source_folder) # This generates "conan_toolchain.cmake" in self.generators_folder tc = CMakeToolchain(self) - if not self.conf.get("tools.build:skip_test", default=False): - tc.variables["BUILD_TESTING"] = "ON" tc.variables["CONAN_CMAKE_SILENT_OUTPUT"] = "ON" tc.variables['CMAKE_EXPORT_COMPILE_COMMANDS'] = 'ON' tc.variables["CTEST_OUTPUT_ON_FAILURE"] = "ON"