Skip to content

Commit a7a91d8

Browse files
committed
conan: Update dependencies.
libqi now defines a `qi_add_module` macro to replace `qi_create_module`.
1 parent 1dee250 commit a7a91d8

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ if(BUILD_TESTING)
297297
include(GoogleTest)
298298

299299
find_package(qimodule REQUIRED)
300-
qi_create_module(moduletest NO_INSTALL)
300+
qi_add_module(moduletest)
301301
target_sources(
302302
moduletest
303303
PRIVATE

conanfile.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@
5252
"system",
5353
]
5454

55+
5556
class QiPythonConan(ConanFile):
5657
requires = [
57-
"boost/[~1.78]",
58-
"pybind11/[^2.9]",
59-
"qi/4.0.2",
58+
"boost/[~1.83]",
59+
"pybind11/[^2.11]",
60+
"qi/[~4]",
6061
]
6162

6263
test_requires = [
@@ -77,9 +78,9 @@ class QiPythonConan(ConanFile):
7778
# Disable every components of Boost unless we actively use them.
7879
default_options.update(
7980
{
80-
f"boost/*:without_{_name}": False
81-
if _name in USED_BOOST_COMPONENTS
82-
else True
81+
f"boost/*:without_{_name}": (
82+
False if _name in USED_BOOST_COMPONENTS else True
83+
)
8384
for _name in BOOST_COMPONENTS
8485
}
8586
)

0 commit comments

Comments
 (0)