Skip to content

Commit 1396f74

Browse files
committed
modern-cpp-kafka: update the requirements & validate, fix the text
1 parent 3fc9902 commit 1396f74

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

recipes/modern-cpp-kafka/all/conanfile.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@ class ModernCppKafkaConan(ConanFile):
1414
settings = "arch", "build_type", "compiler", "os"
1515
no_copy_source = True
1616

17+
def requirements(self):
18+
self.requires("librdkafka/1.8.2")
19+
1720
@property
1821
def _source_subfolder(self):
1922
return "source_subfolder"
2023

2124
def source(self):
2225
tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder)
2326

27+
def validate(self):
28+
if self.settings.compiler.get_safe("cppstd"):
29+
tools.check_min_cppstd(self, 17)
30+
2431
def package(self):
2532
self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder)
2633
self.copy(pattern="*.h", dst="include", src=os.path.join(self._source_subfolder, "include"))

recipes/modern-cpp-kafka/all/test_package/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ conan_basic_setup()
66

77
set(CMAKE_CXX_STANDARD 17)
88

9-
find_package(RdKafka REQUIRED CONFIG)
109
find_package(ModernCppKafka REQUIRED CONFIG)
1110

1211
add_executable(${PROJECT_NAME} test_package.cpp)
13-
target_link_libraries(${PROJECT_NAME} RdKafka::rdkafka ModernCppKafka::ModernCppKafka)
12+
target_link_libraries(${PROJECT_NAME} ModernCppKafka::ModernCppKafka)
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1+
# pylint: skip-file
12
from conans import ConanFile, CMake, tools
23
import os
34

45
class TestPackageConan(ConanFile):
56
settings = "os", "arch", "compiler", "build_type"
67
generators = "cmake", "cmake_find_package_multi"
78

8-
def requirements(self):
9-
self.requires("librdkafka/1.8.2")
10-
119
def build(self):
1210
cmake = CMake(self)
1311
cmake.configure()
1412
cmake.build()
1513

1614
def test(self):
17-
if not tools.cross_building(self):
15+
if not tools.cross_building(self.settings):
1816
bin_path = os.path.join("bin", "test_package")
1917
self.run(bin_path, run_environment=True)

0 commit comments

Comments
 (0)