浏览代码

cmake: Find Qt first before going to subdirectories

jp9000 7 年之前
父节点
当前提交
cb4d2ff7fa
共有 2 个文件被更改,包括 18 次插入17 次删除
  1. 18 0
      CMakeLists.txt
  2. 0 17
      UI/CMakeLists.txt

+ 18 - 0
CMakeLists.txt

@@ -132,6 +132,24 @@ if(NOT INSTALLER_RUN)
 		set(UI_ENABLED FALSE)
 	else()
 		set(UI_ENABLED TRUE)
+
+		if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+			set(_lib_suffix 64)
+		else()
+			set(_lib_suffix 32)
+		endif()
+
+		if(DEFINED QTDIR${_lib_suffix})
+			list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
+		elseif(DEFINED QTDIR)
+			list(APPEND CMAKE_PREFIX_PATH "${QTDIR}")
+		elseif(DEFINED ENV{QTDIR${_lib_suffix}})
+			list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR${_lib_suffix}}")
+		elseif(DEFINED ENV{QTDIR})
+			list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
+		endif()
+
+		find_package(Qt5Widgets ${FIND_MODE})
 	endif()
 
 	add_subdirectory(deps)

+ 0 - 17
UI/CMakeLists.txt

@@ -19,26 +19,9 @@ project(obs)
 
 set(DISABLE_UPDATE_MODULE TRUE CACHE BOOL "Disables building the update module")
 
-if(DEFINED QTDIR${_lib_suffix})
-	list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
-elseif(DEFINED QTDIR)
-	list(APPEND CMAKE_PREFIX_PATH "${QTDIR}")
-elseif(DEFINED ENV{QTDIR${_lib_suffix}})
-	list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR${_lib_suffix}}")
-elseif(DEFINED ENV{QTDIR})
-	list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
-endif()
-
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 set(CMAKE_AUTOMOC TRUE)
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(_lib_suffix 64)
-else()
-	set(_lib_suffix 32)
-endif()
-
-find_package(Qt5Widgets ${FIND_MODE})
 find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
 
 if(APPLE)