From 7c13e1d1b6ca7a28a1d48c167bf8187a24acab44 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sun, 9 Jun 2019 13:48:25 -0700 Subject: Added 'Diligent-' prefix to project names to avoid name conflicts (https://github.com/DiligentGraphics/DiligentEngine/issues/20) --- TextureLoader/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'TextureLoader') diff --git a/TextureLoader/CMakeLists.txt b/TextureLoader/CMakeLists.txt index 07e9cf4..4918fec 100644 --- a/TextureLoader/CMakeLists.txt +++ b/TextureLoader/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.6) -project(TextureLoader CXX) +project(Diligent-TextureLoader CXX) set(INCLUDE include/DDSLoader.h @@ -22,10 +22,10 @@ set(SOURCE src/TextureUtilities.cpp ) -add_library(TextureLoader STATIC ${SOURCE} ${INCLUDE} ${INTERFACE}) -set_common_target_properties(TextureLoader) +add_library(Diligent-TextureLoader STATIC ${SOURCE} ${INCLUDE} ${INTERFACE}) +set_common_target_properties(Diligent-TextureLoader) -target_include_directories(TextureLoader +target_include_directories(Diligent-TextureLoader PUBLIC interface PRIVATE @@ -36,19 +36,19 @@ source_group("source" FILES ${SOURCE}) source_group("include" FILES ${INCLUDE}) source_group("interface" FILES ${INTERFACE}) -target_link_libraries(TextureLoader +target_link_libraries(Diligent-TextureLoader PRIVATE - BuildSettings - Common - PlatformInterface - GraphicsEngineInterface - GraphicsAccessories + Diligent-BuildSettings + Diligent-Common + Diligent-PlatformInterface + Diligent-GraphicsEngineInterface + Diligent-GraphicsAccessories LibJpeg LibPng LibTiff ZLib ) -set_target_properties(TextureLoader PROPERTIES +set_target_properties(Diligent-TextureLoader PROPERTIES FOLDER Tools ) \ No newline at end of file -- cgit v1.2.3