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

Add TBB in conanfile and CMakeLists

CMakeLists.txt

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

conanfile.py

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