瀏覽代碼

Linguist tools are now optional

Ivan Savenko 3 年之前
父節點
當前提交
82f1370111
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      CMakeLists.txt

+ 5 - 3
CMakeLists.txt

@@ -329,10 +329,12 @@ endif()
 
 
 if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
 if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
 	# Widgets finds its own dependencies (QtGui and QtCore).
 	# Widgets finds its own dependencies (QtGui and QtCore).
-	find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network OPTIONAL_COMPONENTS LinguistTools)
-	find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network OPTIONAL_COMPONENTS LinguistTools)
+	find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network )
+	find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network )
 
 
-	if (NOT DEFINED Qt5LinguistTools_DIR)
+	find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools )
+	find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools)
+	if (NOT Qt5LinguistTools_DIR)
 		set(ENABLE_TRANSLATIONS OFF)
 		set(ENABLE_TRANSLATIONS OFF)
 	endif()
 	endif()
 endif()
 endif()