From f4dc48ccc69fc2f8564606e55f50bee3ee236af0 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
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 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Common')

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
-- 
cgit v1.2.3