diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-12 06:42:41 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-12 06:42:41 +0000 |
| commit | 9742e365bf8b9d2ced2d547e39c47ab4b05b5118 (patch) | |
| tree | d00fa4b2ea8c6b0128793c05f508be3aafa3aaa6 /Graphics | |
| parent | Fixed compiler warnings (diff) | |
| download | DiligentCore-9742e365bf8b9d2ced2d547e39c47ab4b05b5118.tar.gz DiligentCore-9742e365bf8b9d2ced2d547e39c47ab4b05b5118.zip | |
Updated CMake files
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 2 |
4 files changed, 26 insertions, 12 deletions
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt index de141267..aea71286 100644 --- a/Graphics/CMakeLists.txt +++ b/Graphics/CMakeLists.txt @@ -13,15 +13,21 @@ set(DLL_DBG_SUFFIX _${ARCH}d) add_subdirectory(GraphicsEngine) -if(PLATFORM_WIN32 OR PLATFORM_UNVIRSAL_WINDOWS) +if(D3D11_SUPPORTED OR D3D12_SUPPORTED) add_subdirectory(GraphicsEngineD3DBase) +endif() + +if(D3D11_SUPPORTED) add_subdirectory(GraphicsEngineD3D11) +endif() + +if(D3D12_SUPPORTED) add_subdirectory(GraphicsEngineD3D12) endif() add_subdirectory(GraphicsTools) -if(PLATFORM_WIN32 OR PLATFORM_ANDROID) +if(GL_SUPPORTED OR GLES_SUPPORTED) add_subdirectory(HLSL2GLSLConverterLib) add_subdirectory(GraphicsEngineOpenGL) endif() diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 596515a0..19b796df 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -119,19 +119,23 @@ PRIVATE include ) -set(DEPENDENCIES +set(PRIVATE_DEPENDENCIES BuildSettings - Common - GraphicsEngine + Common GraphicsEngineD3DBase GraphicsTools TargetPlatform d3d11.lib d3dcompiler.lib ) -target_link_libraries(GraphicsEngineD3D11-static PRIVATE ${DEPENDENCIES}) -target_link_libraries(GraphicsEngineD3D11-shared PRIVATE ${DEPENDENCIES}) +set(PUBLIC_DEPENDENCIES + GraphicsEngine +) + +target_link_libraries(GraphicsEngineD3D11-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) + +target_link_libraries(GraphicsEngineD3D11-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) target_compile_definitions(GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL) source_group("src" FILES diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index 1a5d105a..970347e7 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -145,10 +145,9 @@ foreach(FILE ${SHADERS}) ) endforeach(FILE) -set(DEPENDENCIES +set(PRIVATE_DEPENDENCIES BuildSettings Common - GraphicsEngine GraphicsEngineD3DBase GraphicsTools TargetPlatform @@ -156,10 +155,15 @@ set(DEPENDENCIES D3D12.lib d3dcompiler.lib ) -target_link_libraries(GraphicsEngineD3D12-static PRIVATE ${DEPENDENCIES}) + +set(PUBLIC_DEPENDENCIES + GraphicsEngine +) + +target_link_libraries(GraphicsEngineD3D12-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) add_dependencies(GraphicsEngineD3D12-static GenerateMipsShaders) -target_link_libraries(GraphicsEngineD3D12-shared PRIVATE ${DEPENDENCIES} ) +target_link_libraries(GraphicsEngineD3D12-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) add_dependencies(GraphicsEngineD3D12-shared GenerateMipsShaders) target_compile_definitions(GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL) diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index afb8dbe9..4c00e862 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -137,13 +137,13 @@ set(PRIVATE_DEPENDENCIES BuildSettings glew-static Common - GraphicsEngine GraphicsTools opengl32.lib TargetPlatform ) set(PUBLIC_DEPENDENCIES + GraphicsEngine HLSL2GLSLConverterLib ) |