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) --- Common/NativeApp/Android/ndk_helper/CMakeLists.txt | 2 +- Common/NativeApp/CMakeLists.txt | 4 ++-- Common/NativeApp/Linux/CMakeLists.txt | 2 +- DiligentCore | 2 +- DiligentFX | 2 +- DiligentSamples | 2 +- DiligentTools | 2 +- Projects/Asteroids/CMakeLists.txt | 10 ++++----- README.md | 11 ++++----- Tests/CMakeLists.txt | 2 +- Tests/IncludeTest/CMakeLists.txt | 2 +- Tests/TestApp/CMakeLists.txt | 14 ++++++------ Tests/TestApp/src/CMakeLists.txt | 26 +++++++++++----------- .../GhostCubePlugin/PluginSource/CMakeLists.txt | 16 ++++++------- unityplugin/GhostCubeScene/CMakeLists.txt | 4 ++-- unityplugin/UnityEmulator/CMakeLists.txt | 16 ++++++------- 16 files changed, 59 insertions(+), 58 deletions(-) diff --git a/Common/NativeApp/Android/ndk_helper/CMakeLists.txt b/Common/NativeApp/Android/ndk_helper/CMakeLists.txt index 6dcf642..653847d 100644 --- a/Common/NativeApp/Android/ndk_helper/CMakeLists.txt +++ b/Common/NativeApp/Android/ndk_helper/CMakeLists.txt @@ -29,7 +29,7 @@ PUBLIC target_link_libraries(NDKHelper PRIVATE - BuildSettings + Diligent-BuildSettings PUBLIC native_app_glue ) diff --git a/Common/NativeApp/CMakeLists.txt b/Common/NativeApp/CMakeLists.txt index f381b88..cbc0dcb 100644 --- a/Common/NativeApp/CMakeLists.txt +++ b/Common/NativeApp/CMakeLists.txt @@ -343,8 +343,8 @@ endif() target_link_libraries(NativeAppBase PRIVATE - BuildSettings - Common + Diligent-BuildSettings + Diligent-Common ) if(PLATFORM_WIN32) diff --git a/Common/NativeApp/Linux/CMakeLists.txt b/Common/NativeApp/Linux/CMakeLists.txt index fae7e73..9c072c5 100644 --- a/Common/NativeApp/Linux/CMakeLists.txt +++ b/Common/NativeApp/Linux/CMakeLists.txt @@ -20,7 +20,7 @@ source_group("interface" FILES ${INTERFACE}) target_link_libraries(XCBKeySyms PRIVATE - BuildSettings + Diligent-BuildSettings ) set_target_properties(XCBKeySyms PROPERTIES diff --git a/DiligentCore b/DiligentCore index 6b7556d..dadf4bb 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit 6b7556d30b12895419162b154fefce772143202f +Subproject commit dadf4bbc5b2d48c901bb2c98d80fe7595bf3ebc0 diff --git a/DiligentFX b/DiligentFX index 8fc5865..f54ef1d 160000 --- a/DiligentFX +++ b/DiligentFX @@ -1 +1 @@ -Subproject commit 8fc5865d13148e653cc41dc77c49201cb3430750 +Subproject commit f54ef1dc142474d23216abbb92714e2ea14b46c5 diff --git a/DiligentSamples b/DiligentSamples index 1404b2c..ef16e4d 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit 1404b2cbe8676c3f78dc04431f74c8094a4b5f42 +Subproject commit ef16e4d61899d4551dc9130f4b8b15e08aa6d0d1 diff --git a/DiligentTools b/DiligentTools index c20b95f..7c13e1d 160000 --- a/DiligentTools +++ b/DiligentTools @@ -1 +1 @@ -Subproject commit c20b95f7275f0dab55d900075e92faacf50faf58 +Subproject commit 7c13e1d1b6ca7a28a1d48c167bf8187a24acab44 diff --git a/Projects/Asteroids/CMakeLists.txt b/Projects/Asteroids/CMakeLists.txt index 9a322f3..5922f01 100644 --- a/Projects/Asteroids/CMakeLists.txt +++ b/Projects/Asteroids/CMakeLists.txt @@ -109,11 +109,11 @@ get_supported_backends(ENGINE_LIBRARIES) target_link_libraries(Asteroids PRIVATE - BuildSettings - TargetPlatform - TextureLoader - Common - GraphicsTools + Diligent-BuildSettings + Diligent-TargetPlatform + Diligent-TextureLoader + Diligent-Common + Diligent-GraphicsTools ${ENGINE_LIBRARIES} d3d11.lib d3d12.lib diff --git a/README.md b/README.md index ecce6b5..d62196e 100644 --- a/README.md +++ b/README.md @@ -368,11 +368,12 @@ add_executable(HelloDiligent WIN32 HelloDiligent.cpp) target_compile_options(HelloDiligent PRIVATE -DUNICODE -DENGINE_DLL) target_include_directories(HelloDiligent PRIVATE "DiligentCore") -add_dependencies(HelloDiligent - GraphicsEngineD3D11-shared - GraphicsEngineOpenGL-shared - GraphicsEngineD3D12-shared - GraphicsEngineVk-shared +target_link_libraries(HelloDiligent +PRIVATE + Diligent-GraphicsEngineD3D11-shared + Diligent-GraphicsEngineOpenGL-shared + Diligent-GraphicsEngineD3D12-shared + Diligent-GraphicsEngineVk-shared ) copy_required_dlls(HelloDiligent) ``` diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 638cdf0..1a85791 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.3) -if(TARGET RenderScript) +if(TARGET Diligent-RenderScript) add_subdirectory(TestApp) endif() diff --git a/Tests/IncludeTest/CMakeLists.txt b/Tests/IncludeTest/CMakeLists.txt index 730c070..1b761cc 100644 --- a/Tests/IncludeTest/CMakeLists.txt +++ b/Tests/IncludeTest/CMakeLists.txt @@ -42,7 +42,7 @@ if(VULKAN_SUPPORTED) endif() target_include_directories(IncludeTest PRIVATE ../..) -target_link_libraries(IncludeTest PRIVATE BuildSettings) +target_link_libraries(IncludeTest PRIVATE Diligent-BuildSettings) set_common_target_properties(IncludeTest) if(MSVC) diff --git a/Tests/TestApp/CMakeLists.txt b/Tests/TestApp/CMakeLists.txt index 9568a4a..00bc7e5 100644 --- a/Tests/TestApp/CMakeLists.txt +++ b/Tests/TestApp/CMakeLists.txt @@ -129,19 +129,19 @@ get_supported_backends(ENGINE_LIBRARIES) target_link_libraries(TestApp PRIVATE - BuildSettings + Diligent-BuildSettings PUBLIC NativeAppBase - Common - GraphicsTools - TargetPlatform - RenderScript - GraphicsAccessories + Diligent-Common + Diligent-GraphicsTools + Diligent-TargetPlatform + Diligent-RenderScript + Diligent-GraphicsAccessories ${ENGINE_LIBRARIES} ) if(GL_SUPPORTED OR GLES_SUPPORTED) - target_link_libraries(TestApp PRIVATE HLSL2GLSLConverterLib) + target_link_libraries(TestApp PRIVATE Diligent-HLSL2GLSLConverterLib) endif() if(GL_SUPPORTED) diff --git a/Tests/TestApp/src/CMakeLists.txt b/Tests/TestApp/src/CMakeLists.txt index befa6fa..20fb0d0 100644 --- a/Tests/TestApp/src/CMakeLists.txt +++ b/Tests/TestApp/src/CMakeLists.txt @@ -85,30 +85,30 @@ endif() if(PLATFORM_WIN32) SET(ENGINE_LIBRARIES - GraphicsEngineD3D11-shared - GraphicsEngineD3D12-shared - GraphicsEngineOpenGL-shared + Diligent-GraphicsEngineD3D11-shared + Diligent-GraphicsEngineD3D12-shared + Diligent-GraphicsEngineOpenGL-shared ) elseif(PLATFORM_ANDROID) SET(ENGINE_LIBRARIES - GraphicsEngineOpenGL-shared + Diligent-GraphicsEngineOpenGL-shared ) elseif(PLATFORM_UNIVERSAL_WINDOWS) SET(ENGINE_LIBRARIES - GraphicsEngineD3D11-static - GraphicsEngineD3D12-static + Diligent-GraphicsEngineD3D11-static + Diligent-GraphicsEngineD3D12-static ) elseif(PLATFORM_LINUX) SET(ENGINE_LIBRARIES - GraphicsEngineOpenGL-shared + Diligent-GraphicsEngineOpenGL-shared ) elseif(PLATFORM_MACOS) SET(ENGINE_LIBRARIES - GraphicsEngineOpenGL-shared + Diligent-GraphicsEngineOpenGL-shared ) elseif(PLATFORM_IOS) SET(ENGINE_LIBRARIES - GraphicsEngineOpenGL-static + Diligent-GraphicsEngineOpenGL-static ) else() message(FATAL_ERROR "Undefined platform") @@ -116,12 +116,12 @@ endif() target_link_libraries(TestApp PRIVATE - BuildSettings + Diligent-BuildSettings PUBLIC NativeAppBase - Common - GraphicsTools - TargetPlatform + Diligent-Common + Diligent-GraphicsTools + Diligent-TargetPlatform ${ENGINE_LIBRARIES} ) 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