summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsTools
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-26 05:42:30 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-26 05:42:30 +0000
commit4dbb1c8679d6b6dd7bfbd2a2c0cd60194911f0e7 (patch)
tree61d7aee466341705d3aef3c3483b047bb7a43d7d /Graphics/GraphicsTools
parentAdded ScreenCapture::HasCapture method (diff)
downloadDiligentCore-4dbb1c8679d6b6dd7bfbd2a2c0cd60194911f0e7.tar.gz
DiligentCore-4dbb1c8679d6b6dd7bfbd2a2c0cd60194911f0e7.zip
moved public public headers of GraphicsTools project to interface folder to make them available in installation
Diffstat (limited to 'Graphics/GraphicsTools')
-rw-r--r--Graphics/GraphicsTools/CMakeLists.txt29
-rw-r--r--Graphics/GraphicsTools/interface/CommonlyUsedStates.h (renamed from Graphics/GraphicsTools/include/CommonlyUsedStates.h)0
-rw-r--r--Graphics/GraphicsTools/interface/GraphicsUtilities.h (renamed from Graphics/GraphicsTools/include/GraphicsUtilities.h)0
-rw-r--r--Graphics/GraphicsTools/interface/ScreenCapture.h (renamed from Graphics/GraphicsTools/include/ScreenCapture.h)0
-rw-r--r--Graphics/GraphicsTools/interface/ShaderMacroHelper.h (renamed from Graphics/GraphicsTools/include/ShaderMacroHelper.h)0
-rw-r--r--Graphics/GraphicsTools/interface/TextureUploader.h (renamed from Graphics/GraphicsTools/include/TextureUploader.h)0
-rw-r--r--Graphics/GraphicsTools/interface/TextureUploaderBase.h (renamed from Graphics/GraphicsTools/include/TextureUploaderBase.h)0
-rw-r--r--Graphics/GraphicsTools/interface/TextureUploaderD3D11.h (renamed from Graphics/GraphicsTools/include/TextureUploaderD3D11.h)0
-rw-r--r--Graphics/GraphicsTools/interface/TextureUploaderD3D12_Vk.h (renamed from Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h)0
-rw-r--r--Graphics/GraphicsTools/interface/TextureUploaderGL.h (renamed from Graphics/GraphicsTools/include/TextureUploaderGL.h)0
-rw-r--r--Graphics/GraphicsTools/interface/pch.h (renamed from Graphics/GraphicsTools/include/pch.h)0
11 files changed, 14 insertions, 15 deletions
diff --git a/Graphics/GraphicsTools/CMakeLists.txt b/Graphics/GraphicsTools/CMakeLists.txt
index eebc2aa5..eb120586 100644
--- a/Graphics/GraphicsTools/CMakeLists.txt
+++ b/Graphics/GraphicsTools/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required (VERSION 3.6)
project(Diligent-GraphicsTools CXX)
-set(INCLUDE
- include/CommonlyUsedStates.h
- include/GraphicsUtilities.h
- include/pch.h
- include/ScreenCapture.h
- include/ShaderMacroHelper.h
- include/TextureUploader.h
- include/TextureUploaderBase.h
+set(INTERFACE
+ interface/CommonlyUsedStates.h
+ interface/GraphicsUtilities.h
+ interface/pch.h
+ interface/ScreenCapture.h
+ interface/ShaderMacroHelper.h
+ interface/TextureUploader.h
+ interface/TextureUploaderBase.h
)
set(SOURCE
@@ -23,26 +23,26 @@ set(DEPENDENCIES)
if(D3D11_SUPPORTED)
list(APPEND SOURCE src/TextureUploaderD3D11.cpp)
- list(APPEND INCLUDE include/TextureUploaderD3D11.h)
+ list(APPEND INTERFACE interface/TextureUploaderD3D11.h)
list(APPEND DEPENDENCIES Diligent-GraphicsEngineD3D11Interface)
endif()
if(D3D12_SUPPORTED OR VULKAN_SUPPORTED)
list(APPEND SOURCE src/TextureUploaderD3D12_Vk.cpp)
- list(APPEND INCLUDE include/TextureUploaderD3D12_Vk.h)
+ list(APPEND INTERFACE interface/TextureUploaderD3D12_Vk.h)
endif()
if(GL_SUPPORTED OR GLES_SUPPORTED)
list(APPEND SOURCE src/TextureUploaderGL.cpp)
- list(APPEND INCLUDE include/TextureUploaderGL.h)
+ list(APPEND INTERFACE interface/TextureUploaderGL.h)
list(APPEND DEPENDENCIES Diligent-GraphicsEngineOpenGLInterface)
endif()
-add_library(Diligent-GraphicsTools STATIC ${SOURCE} ${INCLUDE})
+add_library(Diligent-GraphicsTools STATIC ${SOURCE} ${INTERFACE})
target_include_directories(Diligent-GraphicsTools
PUBLIC
- include
+ interface
PRIVATE
../GraphicsEngineD3DBase/include
)
@@ -68,7 +68,6 @@ endif()
set_common_target_properties(Diligent-GraphicsTools)
source_group("src" FILES ${SOURCE})
-source_group("include" FILES ${INCLUDE})
source_group("interface" FILES ${INTERFACE})
set_target_properties(Diligent-GraphicsTools PROPERTIES
@@ -77,4 +76,4 @@ set_target_properties(Diligent-GraphicsTools PROPERTIES
if(DILIGENT_INSTALL_CORE)
install_core_lib(Diligent-GraphicsTools)
-endif() \ No newline at end of file
+endif()
diff --git a/Graphics/GraphicsTools/include/CommonlyUsedStates.h b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
index f52bd34d..f52bd34d 100644
--- a/Graphics/GraphicsTools/include/CommonlyUsedStates.h
+++ b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
diff --git a/Graphics/GraphicsTools/include/GraphicsUtilities.h b/Graphics/GraphicsTools/interface/GraphicsUtilities.h
index 8638d211..8638d211 100644
--- a/Graphics/GraphicsTools/include/GraphicsUtilities.h
+++ b/Graphics/GraphicsTools/interface/GraphicsUtilities.h
diff --git a/Graphics/GraphicsTools/include/ScreenCapture.h b/Graphics/GraphicsTools/interface/ScreenCapture.h
index 019bfa2a..019bfa2a 100644
--- a/Graphics/GraphicsTools/include/ScreenCapture.h
+++ b/Graphics/GraphicsTools/interface/ScreenCapture.h
diff --git a/Graphics/GraphicsTools/include/ShaderMacroHelper.h b/Graphics/GraphicsTools/interface/ShaderMacroHelper.h
index 44ea1290..44ea1290 100644
--- a/Graphics/GraphicsTools/include/ShaderMacroHelper.h
+++ b/Graphics/GraphicsTools/interface/ShaderMacroHelper.h
diff --git a/Graphics/GraphicsTools/include/TextureUploader.h b/Graphics/GraphicsTools/interface/TextureUploader.h
index a67c7b9b..a67c7b9b 100644
--- a/Graphics/GraphicsTools/include/TextureUploader.h
+++ b/Graphics/GraphicsTools/interface/TextureUploader.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderBase.h b/Graphics/GraphicsTools/interface/TextureUploaderBase.h
index 6026d60b..6026d60b 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderBase.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderBase.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderD3D11.h b/Graphics/GraphicsTools/interface/TextureUploaderD3D11.h
index 9de6d84e..9de6d84e 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderD3D11.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderD3D11.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h b/Graphics/GraphicsTools/interface/TextureUploaderD3D12_Vk.h
index b3ca4bef..b3ca4bef 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderD3D12_Vk.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderGL.h b/Graphics/GraphicsTools/interface/TextureUploaderGL.h
index 8d4fb3b2..8d4fb3b2 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderGL.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderGL.h
diff --git a/Graphics/GraphicsTools/include/pch.h b/Graphics/GraphicsTools/interface/pch.h
index e8997cc7..e8997cc7 100644
--- a/Graphics/GraphicsTools/include/pch.h
+++ b/Graphics/GraphicsTools/interface/pch.h