diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-06-09 21:08:31 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-06-09 21:08:31 +0000 |
| commit | f4dc48ccc69fc2f8564606e55f50bee3ee236af0 (patch) | |
| tree | 209b2fb438498979aebaf669e065b31a46d81ade /Tests | |
| parent | Updated samples (updated gradle build tools to 3.4.1) (diff) | |
| download | DiligentEngine-f4dc48ccc69fc2f8564606e55f50bee3ee236af0.tar.gz DiligentEngine-f4dc48ccc69fc2f8564606e55f50bee3ee236af0.zip | |
Added 'Diligent-' prefix to project names to avoid name conflicts (fixed https://github.com/DiligentGraphics/DiligentEngine/issues/20)
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/IncludeTest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/TestApp/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Tests/TestApp/src/CMakeLists.txt | 26 |
4 files changed, 22 insertions, 22 deletions
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} ) |