Added 'Diligent-' prefix to project names to avoid name conflicts (DiligentGraphics/DiligentEngine#20)

TheMostDiligent · TheMostDiligent · commit ef16e4d61899 · 2019-06-09T13:56:34.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,7 @@ function(add_sample_app APP_NAME IDE_FOLDER SOURCE INCLUDE SHADERS ASSETS)
 	target_link_libraries(${APP_NAME}
 	PRIVATE
 		NativeAppBase
-		BuildSettings
+		Diligent-BuildSettings
 		SampleBase 
 	)
 	set_common_target_properties(${APP_NAME})
diff --git a/External/TwBarLib/CMakeLists.txt b/External/TwBarLib/CMakeLists.txt
@@ -121,10 +121,10 @@ endif()
 
 target_link_libraries(TwBarLib 
 PRIVATE
-    BuildSettings 
-    Common 
-    GraphicsEngineInterface
-    PlatformInterface
+    Diligent-BuildSettings 
+    Diligent-Common 
+    Diligent-GraphicsEngineInterface
+    Diligent-PlatformInterface
 )
 
 target_include_directories(TwBarLib
diff --git a/Samples/AntTweakBar/CMakeLists.txt b/Samples/AntTweakBar/CMakeLists.txt
@@ -23,7 +23,7 @@ set(ASSETS
 )
 
 add_sample_app("AntTweakBarSample" "Samples" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(AntTweakBarSample PRIVATE RenderScript)
+target_link_libraries(AntTweakBarSample PRIVATE Diligent-RenderScript)
 
 set_source_files_properties(${ASSETS} PROPERTIES
     VS_DEPLOYMENT_LOCATION "."
diff --git a/Samples/Atmosphere/CMakeLists.txt b/Samples/Atmosphere/CMakeLists.txt
@@ -81,8 +81,8 @@ PRIVATE
 
 target_link_libraries(AtmosphereSample
 PRIVATE
-    GraphicsAccessories
-    TextureLoader
+    Diligent-GraphicsAccessories
+    Diligent-TextureLoader
     DiligentFX
 )
 
diff --git a/Samples/CMakeLists.txt b/Samples/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.6)
 
 add_subdirectory(SampleBase)
-if(TARGET RenderScript)
+if(TARGET Diligent-RenderScript)
     add_subdirectory(AntTweakBar)
 endif()
 if(TARGET DiligentFX)
diff --git a/Samples/GLTFViewer/CMakeLists.txt b/Samples/GLTFViewer/CMakeLists.txt
@@ -34,7 +34,7 @@ set(ASSETS
 )
 
 add_sample_app("GLTFViewer" "Samples" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(GLTFViewer PRIVATE AssetLoader DiligentFX)
+target_link_libraries(GLTFViewer PRIVATE Diligent-AssetLoader DiligentFX)
 
 target_include_directories(GLTFViewer PRIVATE
     ../../../DiligentFX/Shaders/PostProcess/ToneMapping/public/
diff --git a/Samples/SampleBase/CMakeLists.txt b/Samples/SampleBase/CMakeLists.txt
@@ -141,14 +141,14 @@ get_supported_backends(ENGINE_LIBRARIES)
 
 target_link_libraries(SampleBase 
 PRIVATE 
-    BuildSettings
+    Diligent-BuildSettings
 PUBLIC
     NativeAppBase
     TwBarLib 
-    Common 
-    GraphicsTools
-    TextureLoader
-    TargetPlatform
+    Diligent-Common 
+    Diligent-GraphicsTools
+    Diligent-TextureLoader
+    Diligent-TargetPlatform
     ${ENGINE_LIBRARIES}
 )
 
diff --git a/Tutorials/Tutorial00_HelloLinux/CMakeLists.txt b/Tutorials/Tutorial00_HelloLinux/CMakeLists.txt
@@ -18,8 +18,8 @@ set_target_properties(Tutorial00_HelloLinux PROPERTIES
     CXX_EXTENSIONS OFF
 )
 
-target_link_libraries(Tutorial00_HelloLinux PRIVATE GL X11 GraphicsEngineOpenGL-shared)
+target_link_libraries(Tutorial00_HelloLinux PRIVATE GL X11 Diligent-GraphicsEngineOpenGL-shared)
 
 if(VULKAN_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloLinux PRIVATE GraphicsEngineVk-shared xcb)
+    target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineVk-shared xcb)
 endif()
diff --git a/Tutorials/Tutorial00_HelloLinux/readme.md b/Tutorials/Tutorial00_HelloLinux/readme.md
@@ -2,6 +2,6 @@
 
 This tutorial demonstrates how to initialize Diligent Engine and render a simple triangle on Linux platform. 
 It is similar to [Tutorial01](../Tutorial01_HelloTriangle), but the project has no dependencies other than 
-on GraphicsEngineOpenGL-shared and all the code is contained in a single file.
+on Diligent-GraphicsEngineOpenGL-shared and Diligent-GraphicsEngineVk-shared and all the code is contained in a single file.
 
 ![](Screenshot.png)
diff --git a/Tutorials/Tutorial00_HelloWin32/CMakeLists.txt b/Tutorials/Tutorial00_HelloWin32/CMakeLists.txt
@@ -25,15 +25,15 @@ set_target_properties(Tutorial00_HelloWin32 PROPERTIES
 target_compile_definitions(Tutorial00_HelloWin32 PRIVATE ENGINE_DLL=1)
 
 if(D3D11_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloWin32 PRIVATE GraphicsEngineD3D11-shared)
+    target_link_libraries(Tutorial00_HelloWin32 PRIVATE Diligent-GraphicsEngineD3D11-shared)
 endif()
 if(D3D12_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloWin32 PRIVATE GraphicsEngineD3D12-shared)
+    target_link_libraries(Tutorial00_HelloWin32 PRIVATE Diligent-GraphicsEngineD3D12-shared)
 endif()
 if(GL_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloWin32 PRIVATE GraphicsEngineOpenGL-shared)
+    target_link_libraries(Tutorial00_HelloWin32 PRIVATE Diligent-GraphicsEngineOpenGL-shared)
 endif()
 if(VULKAN_SUPPORTED)
-    target_link_libraries(Tutorial00_HelloWin32 PRIVATE GraphicsEngineVk-shared)
+    target_link_libraries(Tutorial00_HelloWin32 PRIVATE Diligent-GraphicsEngineVk-shared)
 endif()
 copy_required_dlls(Tutorial00_HelloWin32)
diff --git a/Tutorials/Tutorial03_Texturing/CMakeLists.txt b/Tutorials/Tutorial03_Texturing/CMakeLists.txt
@@ -20,4 +20,4 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial03_Texturing" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial03_Texturing PRIVATE TextureLoader)
+target_link_libraries(Tutorial03_Texturing PRIVATE Diligent-TextureLoader)
diff --git a/Tutorials/Tutorial04_Instancing/CMakeLists.txt b/Tutorials/Tutorial04_Instancing/CMakeLists.txt
@@ -20,4 +20,4 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial04_Instancing" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial04_Instancing PRIVATE TextureLoader)
+target_link_libraries(Tutorial04_Instancing PRIVATE Diligent-TextureLoader)
diff --git a/Tutorials/Tutorial05_TextureArray/CMakeLists.txt b/Tutorials/Tutorial05_TextureArray/CMakeLists.txt
@@ -23,4 +23,4 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial05_TextureArray" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial05_TextureArray PRIVATE TextureLoader)
+target_link_libraries(Tutorial05_TextureArray PRIVATE Diligent-TextureLoader)
diff --git a/Tutorials/Tutorial06_Multithreading/CMakeLists.txt b/Tutorials/Tutorial06_Multithreading/CMakeLists.txt
@@ -23,7 +23,7 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial06_Multithreading" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial06_Multithreading PRIVATE TextureLoader)
+target_link_libraries(Tutorial06_Multithreading PRIVATE Diligent-TextureLoader)
 if(PLATFORM_LINUX)
     target_link_libraries(Tutorial06_Multithreading PRIVATE pthread)
 endif()
diff --git a/Tutorials/Tutorial07_GeometryShader/CMakeLists.txt b/Tutorials/Tutorial07_GeometryShader/CMakeLists.txt
@@ -22,4 +22,4 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial07_GeometryShader" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial07_GeometryShader PRIVATE TextureLoader)
+target_link_libraries(Tutorial07_GeometryShader PRIVATE Diligent-TextureLoader)
diff --git a/Tutorials/Tutorial08_Tessellation/CMakeLists.txt b/Tutorials/Tutorial08_Tessellation/CMakeLists.txt
@@ -26,4 +26,4 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial08_Tessellation" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial08_Tessellation PRIVATE TextureLoader)
+target_link_libraries(Tutorial08_Tessellation PRIVATE Diligent-TextureLoader)
diff --git a/Tutorials/Tutorial09_Quads/CMakeLists.txt b/Tutorials/Tutorial09_Quads/CMakeLists.txt
@@ -25,7 +25,7 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial09_Quads" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial09_Quads PRIVATE TextureLoader)
+target_link_libraries(Tutorial09_Quads PRIVATE Diligent-TextureLoader)
 if(PLATFORM_LINUX)
     target_link_libraries(Tutorial09_Quads PRIVATE pthread)
 endif()
diff --git a/Tutorials/Tutorial10_DataStreaming/CMakeLists.txt b/Tutorials/Tutorial10_DataStreaming/CMakeLists.txt
@@ -25,7 +25,7 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial10_DataStreaming" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial10_DataStreaming PRIVATE TextureLoader)
+target_link_libraries(Tutorial10_DataStreaming PRIVATE Diligent-TextureLoader)
 if(PLATFORM_LINUX)
     target_link_libraries(Tutorial10_DataStreaming PRIVATE pthread)
 endif()
diff --git a/Tutorials/Tutorial11_ResourceUpdates/CMakeLists.txt b/Tutorials/Tutorial11_ResourceUpdates/CMakeLists.txt
@@ -23,4 +23,4 @@ set(ASSETS
 )
 
 add_sample_app("Tutorial11_ResourceUpdates" "Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
-target_link_libraries(Tutorial11_ResourceUpdates PRIVATE TextureLoader)
+target_link_libraries(Tutorial11_ResourceUpdates PRIVATE Diligent-TextureLoader)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ function(add_sample_app APP_NAME IDE_FOLDER SOURCE INCLUDE SHADERS ASSETS)`
`35`	`35`	`target_link_libraries(${APP_NAME}`
`36`	`36`	`PRIVATE`
`37`	`37`	`NativeAppBase`
`38`		`- BuildSettings`
	`38`	`+ Diligent-BuildSettings`
`39`	`39`	`SampleBase`
`40`	`40`	`)`
`41`	`41`	`set_common_target_properties(${APP_NAME})`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ set(ASSETS`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`add_sample_app("AntTweakBarSample" "Samples" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")`
`26`		`-target_link_libraries(AntTweakBarSample PRIVATE RenderScript)`
	`26`	`+target_link_libraries(AntTweakBarSample PRIVATE Diligent-RenderScript)`
`27`	`27`
`28`	`28`	`set_source_files_properties(${ASSETS} PROPERTIES`
`29`	`29`	`VS_DEPLOYMENT_LOCATION "."`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ PRIVATE`
`81`	`81`
`82`	`82`	`target_link_libraries(AtmosphereSample`
`83`	`83`	`PRIVATE`
`84`		`- GraphicsAccessories`
`85`		`- TextureLoader`
	`84`	`+ Diligent-GraphicsAccessories`
	`85`	`+ Diligent-TextureLoader`
`86`	`86`	`DiligentFX`
`87`	`87`	`)`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ set(ASSETS`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`add_sample_app("GLTFViewer" "Samples" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")`
`37`		`-target_link_libraries(GLTFViewer PRIVATE AssetLoader DiligentFX)`
	`37`	`+target_link_libraries(GLTFViewer PRIVATE Diligent-AssetLoader DiligentFX)`
`38`	`38`
`39`	`39`	`target_include_directories(GLTFViewer PRIVATE`
`40`	`40`	`../../../DiligentFX/Shaders/PostProcess/ToneMapping/public/`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ set_target_properties(Tutorial00_HelloLinux PROPERTIES`
`18`	`18`	`CXX_EXTENSIONS OFF`
`19`	`19`	`)`
`20`	`20`
`21`		`-target_link_libraries(Tutorial00_HelloLinux PRIVATE GL X11 GraphicsEngineOpenGL-shared)`
	`21`	`+target_link_libraries(Tutorial00_HelloLinux PRIVATE GL X11 Diligent-GraphicsEngineOpenGL-shared)`
`22`	`22`
`23`	`23`	`if(VULKAN_SUPPORTED)`
`24`		`- target_link_libraries(Tutorial00_HelloLinux PRIVATE GraphicsEngineVk-shared xcb)`
	`24`	`+ target_link_libraries(Tutorial00_HelloLinux PRIVATE Diligent-GraphicsEngineVk-shared xcb)`
`25`	`25`	`endif()`