summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3DBase
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2017-12-14 02:26:47 +0000
committerEgor Yusov <egor.yusov@gmail.com>2017-12-14 02:26:47 +0000
commitca792090564a12ab85ffcf77f3054d5d6bf3330c (patch)
tree58ce00b38e7057c2df9ae13c642402f123b537da /Graphics/GraphicsEngineD3DBase
parentAdded option to create shader from bytecode for D3D11 and D3D12 (diff)
downloadDiligentCore-ca792090564a12ab85ffcf77f3054d5d6bf3330c.tar.gz
DiligentCore-ca792090564a12ab85ffcf77f3054d5d6bf3330c.zip
Enabling universal windows platform in cmake
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
-rw-r--r--Graphics/GraphicsEngineD3DBase/CMakeLists.txt14
1 files changed, 11 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
index 17122d8d..0fd12bca 100644
--- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.3)
+cmake_minimum_required (VERSION 3.8)
project(GraphicsEngineD3DBase CXX)
@@ -35,13 +35,21 @@ add_custom_target(ProcessHLSLDefinitions
SOURCES
include/HLSLDefinitions.fxh
)
-add_dependencies(ProcessHLSLDefinitions File2String)
+
+if(PLATFORM_UNIVERSAL_WINDOWS)
+ # On Universal Windows Platform, we cannot run File2String utility and will use prebuilt Win32 version
+ get_target_property(FILE2STRING_SOURCE_DIR File2String SOURCE_DIR)
+ set(FILE2STRING_PATH "${FILE2STRING_SOURCE_DIR}/File2String.exe")
+else()
+ add_dependencies(ProcessHLSLDefinitions File2String)
+ set(FILE2STRING_PATH $<TARGET_FILE:File2String>)
+endif()
add_custom_command(TARGET ProcessHLSLDefinitions
# Unfortunately it is not possible to set TARGET directly to GraphicsEngineD3DBase
# because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators
# PRE_BUILD is treated as PRE_LINK.
- COMMAND $<TARGET_FILE:File2String> include/HLSLDefinitions.fxh include/HLSLDefinitions_inc.fxh
+ COMMAND ${FILE2STRING_PATH} include/HLSLDefinitions.fxh include/HLSLDefinitions_inc.fxh
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Processing HLSLDefinitions.fxh"
VERBATIM