瀏覽代碼

Merge pull request #2287 from pkubaj/patch-1

CMake: Fix build on ppc64
Jim 6 年之前
父節點
當前提交
8870676667
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      CMakeLists.txt
  2. 1 1
      deps/media-playback/CMakeLists.txt
  3. 1 1
      libobs/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -78,7 +78,7 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "C
 	set(CMAKE_COMPILER_IS_CLANG TRUE)
 endif()
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64(le)?")
 	add_compile_definitions(NO_WARN_X86_INTRINSICS)
 endif()
 

+ 1 - 1
deps/media-playback/CMakeLists.txt

@@ -23,7 +23,7 @@ add_library(media-playback STATIC
 	${media-playback_SOURCES}
 	)
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64(le)?")
 	target_compile_options(media-playback
 			PUBLIC
 			-mvsx)

+ 1 - 1
libobs/CMakeLists.txt

@@ -474,7 +474,7 @@ target_compile_definitions(libobs
 	PUBLIC
 		HAVE_OBSCONFIG_H)
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64(le)?")
 	target_compile_options(libobs
 		PUBLIC
 			-mvsx)