소스 검색

Add an option to disable Nullkiller AI

Hennadii Chernyshchyk 2 년 전
부모
커밋
1ccbc209a4
2개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 8 4
      AI/CMakeLists.txt
  2. 0 1
      CMakeLists.txt

+ 8 - 4
AI/CMakeLists.txt

@@ -2,15 +2,19 @@
 #        FuzzyLite support            #
 #######################################
 
+option(ENABLE_NULLKILLER_AI "Enable compilation of Nullkiller AI library" ON)
 if(NOT WIN32 AND NOT APPLE)
 	option(FORCE_BUNDLED_FL "Force to use FuzzyLite included into VCMI's source tree" ON)
 else()
 	option(FORCE_BUNDLED_FL "Force to use FuzzyLite included into VCMI's source tree" OFF)
 endif()
 
-if(TBB_FOUND AND MSVC)
-	   install_vcpkg_imported_tgt(TBB::tbb)
-endif()
+if(ENABLE_NULLKILLER_AI)
+	find_package(TBB REQUIRED)
+	if(MSVC)
+		install_vcpkg_imported_tgt(TBB::tbb)
+	endif()
+end()
 
 
 if(NOT FORCE_BUNDLED_FL)
@@ -40,6 +44,6 @@ add_subdirectory(BattleAI)
 add_subdirectory(StupidAI)
 add_subdirectory(EmptyAI)
 add_subdirectory(VCAI)
-if(TBB_FOUND)
+if(ENABLE_NULLKILLER_AI)
 	add_subdirectory(Nullkiller)
 endif()

+ 0 - 1
CMakeLists.txt

@@ -312,7 +312,6 @@ find_package(SDL2_ttf REQUIRED)
 if(TARGET SDL2_ttf::SDL2_ttf)
 	add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf)
 endif()
-find_package(TBB)
 
 if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
 	# Widgets finds its own dependencies (QtGui and QtCore).