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) --- Tests/TestApp/src/CMakeLists.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Tests/TestApp/src') 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} ) -- cgit v1.2.3