Skip to content

Commit

Permalink
Recipe improvements. (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
szmyd authored Aug 1, 2024
1 parent e706a86 commit 66c8b09
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down
6 changes: 1 addition & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 66c8b09

Please sign in to comment.