From f4dc48ccc69fc2f8564606e55f50bee3ee236af0 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sun, 9 Jun 2019 14:08:31 -0700 Subject: Added 'Diligent-' prefix to project names to avoid name conflicts (fixed https://github.com/DiligentGraphics/DiligentEngine/issues/20) --- unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt | 16 ++++++++-------- unityplugin/GhostCubeScene/CMakeLists.txt | 4 ++-- unityplugin/UnityEmulator/CMakeLists.txt | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'unityplugin') diff --git a/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt b/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt index a340286..e9b8fa2 100644 --- a/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt +++ b/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt @@ -60,23 +60,23 @@ if(MSVC) endif() set(PRIVATE_DEPENDENCIES - BuildSettings - TargetPlatform - Common - GraphicsAccessories - GraphicsTools + Diligent-BuildSettings + Diligent-TargetPlatform + Diligent-Common + Diligent-GraphicsAccessories + Diligent-GraphicsTools ) if(D3D11_SUPPORTED) - list(APPEND PRIVATE_DEPENDENCIES GraphicsEngineD3D11-static) + list(APPEND PRIVATE_DEPENDENCIES Diligent-GraphicsEngineD3D11-static) endif() if(D3D12_SUPPORTED) - list(APPEND PRIVATE_DEPENDENCIES GraphicsEngineD3D12-static) + list(APPEND PRIVATE_DEPENDENCIES Diligent-GraphicsEngineD3D12-static) endif() if(GL_SUPPORTED OR GLES_SUPPORTED) - list(APPEND PRIVATE_DEPENDENCIES GraphicsEngineOpenGL-static) + list(APPEND PRIVATE_DEPENDENCIES Diligent-GraphicsEngineOpenGL-static) endif() target_link_libraries(GhostCubePlugin-shared PRIVATE ${PRIVATE_DEPENDENCIES}) diff --git a/unityplugin/GhostCubeScene/CMakeLists.txt b/unityplugin/GhostCubeScene/CMakeLists.txt index e657e51..2b3dac7 100644 --- a/unityplugin/GhostCubeScene/CMakeLists.txt +++ b/unityplugin/GhostCubeScene/CMakeLists.txt @@ -86,10 +86,10 @@ PRIVATE target_link_libraries(GhostCubeScene PRIVATE - BuildSettings + Diligent-BuildSettings NativeAppBase UnityEmulator - TargetPlatform + Diligent-TargetPlatform ) if(PLATFORM_ANDROID) target_link_libraries(GhostCubeScene PRIVATE GhostCubePlugin-shared) diff --git a/unityplugin/UnityEmulator/CMakeLists.txt b/unityplugin/UnityEmulator/CMakeLists.txt index 9fe7ca2..6a091a7 100644 --- a/unityplugin/UnityEmulator/CMakeLists.txt +++ b/unityplugin/UnityEmulator/CMakeLists.txt @@ -133,13 +133,13 @@ endif() target_link_libraries(UnityEmulator PRIVATE - BuildSettings + Diligent-BuildSettings PUBLIC NativeAppBase - Common - GraphicsEngine - GraphicsTools - TargetPlatform + Diligent-Common + Diligent-GraphicsEngine + Diligent-GraphicsTools + Diligent-TargetPlatform ) if(GL_SUPPORTED) @@ -147,15 +147,15 @@ if(GL_SUPPORTED) endif() if(GL_SUPPORTED OR GLES_SUPPORTED) - target_link_libraries(UnityEmulator PUBLIC GraphicsEngineOpenGL-static) + target_link_libraries(UnityEmulator PUBLIC Diligent-GraphicsEngineOpenGL-static) endif() if(D3D11_SUPPORTED) - target_link_libraries(UnityEmulator PUBLIC GraphicsEngineD3DBase GraphicsEngineD3D11-static) + target_link_libraries(UnityEmulator PUBLIC Diligent-GraphicsEngineD3DBase Diligent-GraphicsEngineD3D11-static) endif() if(D3D12_SUPPORTED) - target_link_libraries(UnityEmulator PUBLIC GraphicsEngineD3DBase GraphicsEngineD3D12-static) + target_link_libraries(UnityEmulator PUBLIC Diligent-GraphicsEngineD3DBase Diligent-GraphicsEngineD3D12-static) endif() if(PLATFORM_UNIVERSAL_WINDOWS) -- cgit v1.2.3