diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-08-25 01:49:03 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-08-25 01:49:03 +0000 |
| commit | b555a964fdbc5b593a7fe4ac2eb070a21f7c866b (patch) | |
| tree | 55fab7e1c7ce795f5a407da7671e2a80e9013f4b /Graphics | |
| parent | Merge branch 'master' into mesh_shader (diff) | |
| download | DiligentCore-b555a964fdbc5b593a7fe4ac2eb070a21f7c866b.tar.gz DiligentCore-b555a964fdbc5b593a7fe4ac2eb070a21f7c866b.zip | |
added namespace to macros
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/CMakeLists.txt | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index b7215a64..00ce6a91 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -182,8 +182,8 @@ if(${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} STRGREATER_EQUAL "10.0.19041.0") set(D12_H_HAS_MESH_SHADER ON CACHE INTERNAL "" FORCE) target_compile_definitions(Diligent-GraphicsEngineD3D12-static PRIVATE D12_H_HAS_MESH_SHADER) endif() -if(${HAS_D12_DXIL_COMPILER}) - target_compile_definitions(Diligent-GraphicsEngineD3D12-static PRIVATE HAS_D12_DXIL_COMPILER) +if(${DILIGENT_HAS_DX12_DXIL_COMPILER}) + target_compile_definitions(Diligent-GraphicsEngineD3D12-static PRIVATE DILIGENT_HAS_DX12_DXIL_COMPILER) endif() # Set output name to GraphicsEngineD3D12_{32|64}{r|d} diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt index 289ecc7e..cfdffb0c 100644 --- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt @@ -70,9 +70,9 @@ PUBLIC set_common_target_properties(Diligent-GraphicsEngineD3DBase) if(${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} STRGREATER_EQUAL "10.0.17763.0") - set(HAS_D12_DXIL_COMPILER TRUE CACHE INTERNAL "" FORCE) + set(DILIGENT_HAS_DX12_DXIL_COMPILER TRUE CACHE INTERNAL "" FORCE) else() - set(HAS_D12_DXIL_COMPILER FALSE CACHE INTERNAL "" FORCE) + set(DILIGENT_HAS_DX12_DXIL_COMPILER FALSE CACHE INTERNAL "" FORCE) endif() source_group("src" FILES ${SOURCE}) diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index edb18711..647cf48f 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -226,12 +226,12 @@ if(NOT Vulkan_FOUND) endif() endif() if(EXISTS ${Vulkan_BINARY}) - set(HAS_VK_DXIL_COMPILER TRUE CACHE INTERNAL "" FORCE) + set(DILIGENT_HAS_VK_DXIL_COMPILER TRUE CACHE INTERNAL "" FORCE) set(DXC_VK_COMPILER_PATH "${Vulkan_BINARY}" CACHE INTERNAL "" FORCE) - target_compile_definitions(Diligent-GraphicsEngineVk-static PRIVATE HAS_VK_DXIL_COMPILER) + target_compile_definitions(Diligent-GraphicsEngineVk-static PRIVATE DILIGENT_HAS_VK_DXIL_COMPILER) message(STATUS "Found DXIL compiler for Vulkan") else() - set(HAS_VK_DXIL_COMPILER FALSE CACHE INTERNAL "" FORCE) + set(DILIGENT_HAS_VK_DXIL_COMPILER FALSE CACHE INTERNAL "" FORCE) endif() if(PLATFORM_WIN32) |