From 98fb9172eb01179eba857e950633b502f2c87d7e Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 17 Dec 2018 08:44:59 -0800 Subject: Made engine core installation optional that is on by default on Win32 and Linux only --- Graphics/GLSLTools/CMakeLists.txt | 4 +++- Graphics/GraphicsAccessories/CMakeLists.txt | 4 +++- Graphics/GraphicsEngine/CMakeLists.txt | 4 +++- Graphics/GraphicsEngineD3D11/CMakeLists.txt | 6 ++++-- Graphics/GraphicsEngineD3D12/CMakeLists.txt | 6 ++++-- Graphics/GraphicsEngineD3DBase/CMakeLists.txt | 4 +++- Graphics/GraphicsEngineNextGenBase/CMakeLists.txt | 4 +++- Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 6 ++++-- Graphics/GraphicsEngineVulkan/CMakeLists.txt | 6 ++++-- Graphics/GraphicsTools/CMakeLists.txt | 4 +++- Graphics/HLSL2GLSLConverterLib/CMakeLists.txt | 4 +++- 11 files changed, 37 insertions(+), 15 deletions(-) (limited to 'Graphics') diff --git a/Graphics/GLSLTools/CMakeLists.txt b/Graphics/GLSLTools/CMakeLists.txt index 2765b5ec..8a98e6d9 100644 --- a/Graphics/GLSLTools/CMakeLists.txt +++ b/Graphics/GLSLTools/CMakeLists.txt @@ -64,4 +64,6 @@ set_target_properties(GLSLTools PROPERTIES FOLDER Core/Graphics ) -install_core_lib(GLSLTools) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GLSLTools) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsAccessories/CMakeLists.txt b/Graphics/GraphicsAccessories/CMakeLists.txt index 00cc3309..65f10313 100644 --- a/Graphics/GraphicsAccessories/CMakeLists.txt +++ b/Graphics/GraphicsAccessories/CMakeLists.txt @@ -39,4 +39,6 @@ set_target_properties(GraphicsAccessories PROPERTIES FOLDER Core/Graphics ) -install_core_lib(GraphicsAccessories) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsAccessories) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngine/CMakeLists.txt b/Graphics/GraphicsEngine/CMakeLists.txt index a853c820..1fc418f3 100644 --- a/Graphics/GraphicsEngine/CMakeLists.txt +++ b/Graphics/GraphicsEngine/CMakeLists.txt @@ -81,4 +81,6 @@ set_target_properties(GraphicsEngine PROPERTIES FOLDER Core/Graphics ) -install_core_lib(GraphicsEngine) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngine) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 1524c28c..4532d5ab 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -143,5 +143,7 @@ set_source_files_properties( readme.md PROPERTIES HEADER_FILE_ONLY TRUE ) -install_core_lib(GraphicsEngineD3D11-shared) -install_core_lib(GraphicsEngineD3D11-static) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngineD3D11-shared) + install_core_lib(GraphicsEngineD3D11-static) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index dc0cc619..22059512 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -178,5 +178,7 @@ set_source_files_properties( readme.md PROPERTIES HEADER_FILE_ONLY TRUE ) -install_core_lib(GraphicsEngineD3D12-shared) -install_core_lib(GraphicsEngineD3D12-static) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngineD3D12-shared) + install_core_lib(GraphicsEngineD3D12-static) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt index 2d439ce4..1e80ae42 100644 --- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt @@ -76,4 +76,6 @@ set_target_properties(ProcessHLSLDefinitions PROPERTIES FOLDER Core/Graphics/Helper ) -install_core_lib(GraphicsEngineD3DBase) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngineD3DBase) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngineNextGenBase/CMakeLists.txt b/Graphics/GraphicsEngineNextGenBase/CMakeLists.txt index ca60313d..428581c5 100644 --- a/Graphics/GraphicsEngineNextGenBase/CMakeLists.txt +++ b/Graphics/GraphicsEngineNextGenBase/CMakeLists.txt @@ -36,4 +36,6 @@ set_target_properties(GraphicsEngineNextGenBase PROPERTIES FOLDER Core/Graphics ) -install_core_lib(GraphicsEngineNextGenBase) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngineNextGenBase) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index 8754515f..751db277 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -237,5 +237,7 @@ set_source_files_properties( readme.md PROPERTIES HEADER_FILE_ONLY TRUE ) -install_core_lib(GraphicsEngineOpenGL-shared) -install_core_lib(GraphicsEngineOpenGL-static) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngineOpenGL-shared) + install_core_lib(GraphicsEngineOpenGL-static) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index c55bf217..6bb043f5 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -257,5 +257,7 @@ set_target_properties(ProcessGenerateMipsVkShader PROPERTIES FOLDER Core/Graphics/Helper ) -install_core_lib(GraphicsEngineVk-shared) -install_core_lib(GraphicsEngineVk-static) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsEngineVk-shared) + install_core_lib(GraphicsEngineVk-static) +endif() \ No newline at end of file diff --git a/Graphics/GraphicsTools/CMakeLists.txt b/Graphics/GraphicsTools/CMakeLists.txt index 3f7b3a14..94847222 100644 --- a/Graphics/GraphicsTools/CMakeLists.txt +++ b/Graphics/GraphicsTools/CMakeLists.txt @@ -69,4 +69,6 @@ set_target_properties(GraphicsTools PROPERTIES FOLDER Core/Graphics ) -install_core_lib(GraphicsTools) +if(INSTALL_DILIGENT_CORE) + install_core_lib(GraphicsTools) +endif() \ No newline at end of file diff --git a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt index 459764d9..c13f1be7 100644 --- a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt +++ b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt @@ -77,4 +77,6 @@ set_target_properties(HLSL2GLSLConverterLib PROPERTIES FOLDER Core/Graphics ) -install_core_lib(HLSL2GLSLConverterLib) \ No newline at end of file +if(INSTALL_DILIGENT_CORE) + install_core_lib(HLSL2GLSLConverterLib) +endif() \ No newline at end of file -- cgit v1.2.3