浏览代码

address code review comments

Simeon Manolov 1 年之前
父节点
当前提交
601840eb5f
共有 3 个文件被更改,包括 3 次插入6 次删除
  1. 0 2
      AI/BattleAI/CMakeLists.txt
  2. 1 1
      CMakeLists.txt
  3. 2 3
      conanfile.py

+ 0 - 2
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()

+ 1 - 1
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()
 

+ 2 - 3
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],