diff --git a/AI/BattleAI/CMakeLists.txt b/AI/BattleAI/CMakeLists.txt index 4d5513bd0..b30be26ce 100644 --- a/AI/BattleAI/CMakeLists.txt +++ b/AI/BattleAI/CMakeLists.txt @@ -24,8 +24,6 @@ set(battleAI_HEADERS BattleExchangeVariant.h ) -find_package(TBB REQUIRED) - if(NOT ENABLE_STATIC_LIBS) list(APPEND battleAI_SRCS main.cpp StdInc.cpp) endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 00a101324..5678ed522 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/conanfile.py b/conanfile.py index b12079286..220340bd0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,9 +21,8 @@ class VCMI(ConanFile): "sdl_ttf/[~2.0.18]", "onetbb/[^2021.3]", ] - _nullkillerAIRequires = [ - ] - requires = _libRequires + _clientRequires + _nullkillerAIRequires + + requires = _libRequires + _clientRequires options = { "default_options_of_requirements": [True, False],