diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-02-13 04:49:03 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-02-13 04:49:03 +0000 |
| commit | 66b3b5f4ff87e705b6bc65df751c91799d1f402a (patch) | |
| tree | 6302d270799933f60334417f306bad7311aeddb5 /Graphics/HLSL2GLSLConverterLib | |
| parent | Minor updates on iOS platform (diff) | |
| download | DiligentCore-66b3b5f4ff87e705b6bc65df751c91799d1f402a.tar.gz DiligentCore-66b3b5f4ff87e705b6bc65df751c91799d1f402a.zip | |
Fixed formatting of cmake files + couple of minor updates
Diffstat (limited to 'Graphics/HLSL2GLSLConverterLib')
| -rw-r--r-- | Graphics/HLSL2GLSLConverterLib/CMakeLists.txt | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt index 1f147ee1..a0855147 100644 --- a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt +++ b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt @@ -3,19 +3,19 @@ cmake_minimum_required (VERSION 3.6) project(HLSL2GLSLConverterLib CXX) set(INCLUDE - include/GLSLDefinitions.h - include/HLSL2GLSLConverterImpl.h - include/HLSL2GLSLConverterObject.h - include/HLSLKeywords.h + include/GLSLDefinitions.h + include/HLSL2GLSLConverterImpl.h + include/HLSL2GLSLConverterObject.h + include/HLSLKeywords.h ) set(INTERFACE - interface/HLSL2GLSLConverter.h + interface/HLSL2GLSLConverter.h ) set(SOURCE - src/HLSL2GLSLConverterImpl.cpp - src/HLSL2GLSLConverterObject.cpp + src/HLSL2GLSLConverterImpl.cpp + src/HLSL2GLSLConverterObject.cpp ) add_library(HLSL2GLSLConverterLib STATIC ${SOURCE} ${INTERFACE} ${INCLUDE} include/GLSLDefinitions_inc.h) @@ -28,44 +28,44 @@ set_source_files_properties( target_include_directories(HLSL2GLSLConverterLib PUBLIC - interface + interface PRIVATE - include + include ) target_link_libraries(HLSL2GLSLConverterLib PRIVATE - BuildSettings - Common - PlatformInterface - GraphicsEngine + BuildSettings + Common + PlatformInterface + GraphicsEngine PUBLIC - GraphicsEngineInterface + GraphicsEngineInterface ) if(NOT FILE2STRING_PATH STREQUAL "") - # Create custom target to convert GLSLDefinitions.h to GLSLDefinitions_inc.h - add_custom_target(ProcessGLSLDefinitions - SOURCES - include/GLSLDefinitions.h - ) + # Create custom target to convert GLSLDefinitions.h to GLSLDefinitions_inc.h + add_custom_target(ProcessGLSLDefinitions + SOURCES + include/GLSLDefinitions.h + ) - add_custom_command(TARGET ProcessGLSLDefinitions - # Unfortunately it is not possible to set TARGET directly to HLSL2GLSLConverterLib - # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators - # PRE_BUILD is treated as PRE_LINK. - COMMAND ${FILE2STRING_PATH} include/GLSLDefinitions.h include/GLSLDefinitions_inc.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Processing GLSLDefinitions.h" - VERBATIM - ) + add_custom_command(TARGET ProcessGLSLDefinitions + # Unfortunately it is not possible to set TARGET directly to HLSL2GLSLConverterLib + # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators + # PRE_BUILD is treated as PRE_LINK. + COMMAND ${FILE2STRING_PATH} include/GLSLDefinitions.h include/GLSLDefinitions_inc.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Processing GLSLDefinitions.h" + VERBATIM + ) - add_dependencies(HLSL2GLSLConverterLib ProcessGLSLDefinitions) - set_target_properties(ProcessGLSLDefinitions PROPERTIES - FOLDER Core/Graphics/Helper - ) + add_dependencies(HLSL2GLSLConverterLib ProcessGLSLDefinitions) + set_target_properties(ProcessGLSLDefinitions PROPERTIES + FOLDER Core/Graphics/Helper + ) else() - message(WARNING "File2String utility is currently unavailable on this host system. This is not an issues unless you modify GLSLDefinitions.h file") + message(WARNING "File2String utility is currently unavailable on this host system. This is not an issues unless you modify GLSLDefinitions.h file") endif() source_group("src" FILES ${SOURCE}) @@ -74,5 +74,5 @@ source_group("interface" FILES ${INTERFACE}) source_group("generated" FILES include/GLSLDefinitions_inc.h) set_target_properties(HLSL2GLSLConverterLib PROPERTIES - FOLDER Core/Graphics + FOLDER Core/Graphics ) |
