games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

Merge pull request #4219 from smanolloff/add-tbb-dependency

Browse Source 
Add TBB in conanfile and CMakeLists
This commit is contained in:
Ivan Savenko 2024-07-08 19:34:08 +03:00 committed by GitHub
commit ae689625e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -519,7 +519,7 @@ if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
endif() endif()
endif() endif()
if(ENABLE_NULLKILLER_AI AND ENABLE_CLIENT) if(ENABLE_CLIENT)
find_package(TBB REQUIRED) find_package(TBB REQUIRED)
endif() endif()

5
conanfile.py
View File

@ -19,11 +19,10 @@ class VCMI(ConanFile):
"sdl_image/[~2.0.5]", "sdl_image/[~2.0.5]",
"sdl_mixer/[~2.0.4]", "sdl_mixer/[~2.0.4]",
"sdl_ttf/[~2.0.18]", "sdl_ttf/[~2.0.18]",
]
_nullkillerAIRequires = [
"onetbb/[^2021.3]", "onetbb/[^2021.3]",
] ]
requires = _libRequires + _clientRequires + _nullkillerAIRequires
requires = _libRequires + _clientRequires
options = { options = {
"default_options_of_requirements": [True, False], "default_options_of_requirements": [True, False],