diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-06-09 20:45:50 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-06-09 20:45:50 +0000 |
| commit | 7231125e6fb1e541aab1d67db744d4c38a07b749 (patch) | |
| tree | 6a0442387fd53b99b1faf124a8e1aea4653e62e8 /Graphics/GraphicsEngineD3D11 | |
| parent | Mathlib: fixed RotationArbitrary function (diff) | |
| download | DiligentCore-7231125e6fb1e541aab1d67db744d4c38a07b749.tar.gz DiligentCore-7231125e6fb1e541aab1d67db744d4c38a07b749.zip | |
Added 'Diligent-' prefix to project names to avoid name conflicts (https://github.com/DiligentGraphics/DiligentEngine/issues/20)
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/CMakeLists.txt | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 630de8cb..861ec9da 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.10) -project(GraphicsEngineD3D11 CXX) +project(Diligent-GraphicsEngineD3D11 CXX) set(INCLUDE @@ -72,60 +72,60 @@ set(SRC src/TextureViewD3D11Impl.cpp ) -add_library(GraphicsEngineD3D11Interface INTERFACE) -target_include_directories(GraphicsEngineD3D11Interface +add_library(Diligent-GraphicsEngineD3D11Interface INTERFACE) +target_include_directories(Diligent-GraphicsEngineD3D11Interface INTERFACE interface ) -target_link_libraries(GraphicsEngineD3D11Interface +target_link_libraries(Diligent-GraphicsEngineD3D11Interface INTERFACE - GraphicsEngineD3DBaseInterface + Diligent-GraphicsEngineD3DBaseInterface ) -add_library(GraphicsEngineD3D11-static STATIC +add_library(Diligent-GraphicsEngineD3D11-static STATIC ${SRC} ${INTERFACE} ${INCLUDE} readme.md ) -add_library(GraphicsEngineD3D11-shared SHARED +add_library(Diligent-GraphicsEngineD3D11-shared SHARED src/DLLMain.cpp src/GraphicsEngineD3D11.def readme.md ) # Set output name to GraphicsEngineD3D11_{32|64}{r|d} -set_dll_output_name(GraphicsEngineD3D11-shared GraphicsEngineD3D11) +set_dll_output_name(Diligent-GraphicsEngineD3D11-shared GraphicsEngineD3D11) -set_common_target_properties(GraphicsEngineD3D11-shared) -set_common_target_properties(GraphicsEngineD3D11-static) +set_common_target_properties(Diligent-GraphicsEngineD3D11-shared) +set_common_target_properties(Diligent-GraphicsEngineD3D11-static) -target_include_directories(GraphicsEngineD3D11-static +target_include_directories(Diligent-GraphicsEngineD3D11-static PRIVATE include ) -target_link_libraries(GraphicsEngineD3D11-static +target_link_libraries(Diligent-GraphicsEngineD3D11-static PRIVATE - BuildSettings - GraphicsEngineD3DBase - TargetPlatform - Common + Diligent-BuildSettings + Diligent-GraphicsEngineD3DBase + Diligent-TargetPlatform + Diligent-Common dxgi.lib d3d11.lib d3dcompiler.lib PUBLIC - GraphicsEngineD3D11Interface + Diligent-GraphicsEngineD3D11Interface ) -target_link_libraries(GraphicsEngineD3D11-shared +target_link_libraries(Diligent-GraphicsEngineD3D11-shared PRIVATE - BuildSettings - GraphicsEngineD3D11-static + Diligent-BuildSettings + Diligent-GraphicsEngineD3D11-static PUBLIC - GraphicsEngineD3D11Interface + Diligent-GraphicsEngineD3D11Interface ) -target_compile_definitions(GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL=1) +target_compile_definitions(Diligent-GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL=1) source_group("src" FILES ${SRC} ) @@ -137,11 +137,11 @@ source_group("dll" FILES source_group("include" FILES ${INCLUDE}) source_group("interface" FILES ${INTERFACE}) -set_target_properties(GraphicsEngineD3D11-static PROPERTIES - FOLDER Core/Graphics +set_target_properties(Diligent-GraphicsEngineD3D11-static PROPERTIES + FOLDER DiligentCore/Graphics ) -set_target_properties(GraphicsEngineD3D11-shared PROPERTIES - FOLDER Core/Graphics +set_target_properties(Diligent-GraphicsEngineD3D11-shared PROPERTIES + FOLDER DiligentCore/Graphics ) set_source_files_properties( @@ -149,6 +149,6 @@ set_source_files_properties( ) if(INSTALL_DILIGENT_CORE) - install_core_lib(GraphicsEngineD3D11-shared) - install_core_lib(GraphicsEngineD3D11-static) + install_core_lib(Diligent-GraphicsEngineD3D11-shared) + install_core_lib(Diligent-GraphicsEngineD3D11-static) endif()
\ No newline at end of file |
