Ver código fonte

Merge branch 'hotfix/directx-skiplist-all'

David Wimsey 11 anos atrás
pai
commit
637db9ba98
1 arquivos alterados com 3 adições e 1 exclusões
  1. 3 1
      Build/CMakeLists.txt

+ 3 - 1
Build/CMakeLists.txt

@@ -356,6 +356,8 @@ if(BUILD_SAMPLES)
     if(WIN32)
     if(WIN32)
 		if(SKIP_DIRECTX_SAMPLES)
 		if(SKIP_DIRECTX_SAMPLES)
 			message("-- Skipping all DirectX samples")
 			message("-- Skipping all DirectX samples")
+			set(SKIP_DIRECTX9_SAMPLE ON)
+			set(SKIP_DIRECTX10_SAMPLE ON)
 		else()
 		else()
 			message("-- Determing if DirectX samples can be built")
 			message("-- Determing if DirectX samples can be built")
 			include(FindDirectX)
 			include(FindDirectX)
@@ -408,8 +410,8 @@ if(BUILD_SAMPLES)
 				endif()
 				endif()
 			else()
 			else()
 				message("-- Determing if DirectX samples can be built - No")
 				message("-- Determing if DirectX samples can be built - No")
-				set(SKIP_DIRECTX_SAMPLES ON)
 				set(SKIP_DIRECTX9_SAMPLE ON)
 				set(SKIP_DIRECTX9_SAMPLE ON)
+				set(SKIP_DIRECTX10_SAMPLE ON)
 			endif()
 			endif()
 		endif()
 		endif()
     elseif(APPLE)
     elseif(APPLE)