CMake: added Diligent-PublicBuildSettings target to properly export required build settings

Author: TheMostDiligent

CMakeLists.txt

@@ -94,7 +94,7 @@ else()
     endif()
 endif(WIN32)
 
-add_library(Diligent-BuildSettings INTERFACE)
+add_library(Diligent-PublicBuildSettings INTERFACE)
 
 if(PLATFORM_WIN32)
     if(MSVC)
@@ -111,21 +111,21 @@ if(PLATFORM_WIN32)
 
     set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on Win32 platform")
 	set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is supported on Win32 platform")
-    target_compile_definitions(Diligent-BuildSettings INTERFACE PLATFORM_WIN32=1)
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_WIN32=1)
 elseif(PLATFORM_UNIVERSAL_WINDOWS)
     set(D3D11_SUPPORTED TRUE CACHE INTERNAL "D3D11 is supported on Universal Windows platform")
 	if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL "10.0")
 		set(D3D12_SUPPORTED TRUE CACHE INTERNAL "D3D12 is supported on Universal Windows platform")
 	endif()
-    target_compile_definitions(Diligent-BuildSettings INTERFACE PLATFORM_UNIVERSAL_WINDOWS=1)
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_UNIVERSAL_WINDOWS=1)
 elseif(PLATFORM_ANDROID)
     set(GLES_SUPPORTED TRUE CACHE INTERNAL "OpenGLES is supported on Android platform")
     set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is supported on Android platform")
-    target_compile_definitions(Diligent-BuildSettings INTERFACE PLATFORM_ANDROID=1)
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_ANDROID=1)
 elseif(PLATFORM_LINUX)
     set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on Linux platform")
     set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is supported on Linux platform")
-    target_compile_definitions(Diligent-BuildSettings INTERFACE PLATFORM_LINUX=1)
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_LINUX=1)
 elseif(PLATFORM_MACOS)
     set(GL_SUPPORTED TRUE CACHE INTERNAL "OpenGL is supported on MacOS platform")
     if(${DILIGENT_CORE_PRO_EXISTS})
@@ -134,7 +134,7 @@ elseif(PLATFORM_MACOS)
         message("DiligentCorePro module is not found. Metal backend will be disabled")
     endif()
     set(VULKAN_SUPPORTED TRUE CACHE INTERNAL "Vulkan is enabled through MoltenVK on MacOS platform")
-    target_compile_definitions(Diligent-BuildSettings INTERFACE PLATFORM_MACOS=1)
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_MACOS=1)
 elseif(PLATFORM_IOS)
     set(GLES_SUPPORTED TRUE CACHE INTERNAL "OpenGLES is supported on iOS platform")
     if(${DILIGENT_CORE_PRO_EXISTS})
@@ -156,7 +156,7 @@ elseif(PLATFORM_IOS)
     else()
         message("VULKAN_SDK or MoltenVK_FRAMEWORK is not defined. Vulkan backend will be disabled.")
     endif()
-    target_compile_definitions(Diligent-BuildSettings INTERFACE PLATFORM_IOS=1)
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE PLATFORM_IOS=1)
 else()
     message(FATAL_ERROR "No PLATFORM_XXX variable defined. Make sure that 'DiligentCore' folder is processed first")
 endif()
@@ -207,8 +207,8 @@ message("GLES_SUPPORTED:   " ${GLES_SUPPORTED})
 message("VULKAN_SUPPORTED: " ${VULKAN_SUPPORTED})
 message("METAL_SUPPORTED:  " ${METAL_SUPPORTED})
 
-target_compile_definitions(Diligent-BuildSettings 
-INTERFACE 
+target_compile_definitions(Diligent-PublicBuildSettings 
+INTERFACE
     D3D11_SUPPORTED=$<BOOL:${D3D11_SUPPORTED}>
     D3D12_SUPPORTED=$<BOOL:${D3D12_SUPPORTED}>
     GL_SUPPORTED=$<BOOL:${GL_SUPPORTED}>
@@ -217,6 +217,28 @@ INTERFACE
     METAL_SUPPORTED=$<BOOL:${METAL_SUPPORTED}>
 )
 
+foreach(DBG_CONFIG ${DEBUG_CONFIGURATIONS})
+    target_compile_definitions(Diligent-PublicBuildSettings INTERFACE "$<$<CONFIG:${DBG_CONFIG}>:DILIGENT_DEVELOPMENT;DILIGENT_DEBUG>")
+endforeach()
+
+if(DILIGENT_DEVELOPMENT)
+    foreach(REL_CONFIG ${RELEASE_CONFIGURATIONS})
+		target_compile_definitions(Diligent-PublicBuildSettings INTERFACE "$<$<CONFIG:${REL_CONFIG}>:DILIGENT_DEVELOPMENT>")
+    endforeach()
+endif()
+
+
+add_library(Diligent-BuildSettings INTERFACE)
+target_link_libraries(Diligent-BuildSettings INTERFACE Diligent-PublicBuildSettings)
+
+foreach(DBG_CONFIG ${DEBUG_CONFIGURATIONS})
+    target_compile_definitions(Diligent-BuildSettings INTERFACE "$<$<CONFIG:${DBG_CONFIG}>:_DEBUG;DEBUG>")
+endforeach()
+
+foreach(REL_CONFIG ${RELEASE_CONFIGURATIONS})
+	target_compile_definitions(Diligent-BuildSettings INTERFACE "$<$<CONFIG:${REL_CONFIG}>:NDEBUG>")
+endforeach()
+
 
 if(MSVC)
     # For msvc, enable level 4 warnings and treat warnings as errors, except for
@@ -247,23 +269,9 @@ if(MSVC)
     # For instance, this way
     # target_compile_options(Diligent-BuildSettings INTERFACE "$<$<CONFIG:RELEASE>:/Ot>")
     # does not work as expected
-
-    set(DEBUG_MACROS DILIGENT_DEVELOPMENT DILIGENT_DEBUG)
-    target_compile_definitions(Diligent-BuildSettings INTERFACE "$<$<CONFIG:DEBUG>:${DEBUG_MACROS}>")
 else()
     # Todo: use __attribute__((always_inline)), but it needs to be defined in a header file
     target_compile_definitions(Diligent-BuildSettings INTERFACE __forceinline=inline)
-
-    set(DEBUG_MACROS _DEBUG DEBUG DILIGENT_DEVELOPMENT DILIGENT_DEBUG)
-    set(RELEASE_MACROS NDEBUG)
-
-    foreach(DBG_CONFIG ${DEBUG_CONFIGURATIONS})
-        target_compile_definitions(Diligent-BuildSettings INTERFACE "$<$<CONFIG:${DBG_CONFIG}>:${DEBUG_MACROS}>")
-    endforeach()
-
-    foreach(REL_CONFIG ${RELEASE_CONFIGURATIONS})
-        target_compile_definitions(Diligent-BuildSettings INTERFACE "$<$<CONFIG:${REL_CONFIG}>:${RELEASE_MACROS}>")
-    endforeach()
 endif(MSVC)
 
 
@@ -295,12 +303,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options(Diligent-BuildSettings INTERFACE $<$<NOT:$<CONFIG:Debug>>:${CLANG_RELEASE_OPTIONS}>)
 endif()
 
-if(DILIGENT_DEVELOPMENT)
-    foreach(REL_CONFIG ${RELEASE_CONFIGURATIONS})
-		target_compile_definitions(Diligent-BuildSettings INTERFACE "$<$<CONFIG:${REL_CONFIG}>:DILIGENT_DEVELOPMENT>")
-    endforeach()
-endif()
-
 if(PLATFORM_MACOS)
     find_library(APP_KIT AppKit)
     if (NOT APP_KIT)

Graphics/CMakeLists.txt

@@ -11,6 +11,7 @@ INTERFACE
 target_link_libraries(Diligent-GraphicsEngineInterface
 INTERFACE
     Diligent-Primitives
+    Diligent-PublicBuildSettings
 )
 
 add_subdirectory(GraphicsAccessories)

Graphics/GraphicsEngine/CMakeLists.txt

@@ -71,6 +71,10 @@ set(INTERFACE
     interface/ShaderBindingTable.h
 )
 
+if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS)
+    list(APPEND INTERFACE interface/LoadEngineDll.h)
+endif()
+
 set(SOURCE
     src/APIInfo.cpp
     src/BottomLevelASBase.cpp

Graphics/GraphicsEngine/interface/LoadEngineDll.h

@@ -60,7 +60,7 @@ inline FARPROC LoadEngineDll(const char* EngineName, const char* GetFactoryFuncN
     const char* Arch = "_32";
 #endif
 
-#ifdef _DEBUG
+#ifdef DILIGENT_DEBUG
     const char* Conf = "d";
 #else
     const char* Conf = "r";

Graphics/GraphicsEngineD3D11/CMakeLists.txt

@@ -84,14 +84,8 @@ set(SRC
 )
 
 add_library(Diligent-GraphicsEngineD3D11Interface INTERFACE)
-target_include_directories(Diligent-GraphicsEngineD3D11Interface
-INTERFACE
-    interface
-)
-target_link_libraries(Diligent-GraphicsEngineD3D11Interface 
-INTERFACE 
-    Diligent-GraphicsEngineD3DBaseInterface
-)
+target_link_libraries     (Diligent-GraphicsEngineD3D11Interface INTERFACE Diligent-GraphicsEngineD3DBaseInterface)
+target_include_directories(Diligent-GraphicsEngineD3D11Interface INTERFACE interface)
 
 
 add_library(Diligent-GraphicsEngineD3D11-static STATIC 

Graphics/GraphicsEngineD3D12/CMakeLists.txt

@@ -136,14 +136,9 @@ set_source_files_properties(${SHADERS} PROPERTIES
 )
 
 add_library(Diligent-GraphicsEngineD3D12Interface INTERFACE)
-target_include_directories(Diligent-GraphicsEngineD3D12Interface
-INTERFACE
-    interface
-)
-target_link_libraries(Diligent-GraphicsEngineD3D12Interface 
-INTERFACE 
-    Diligent-GraphicsEngineD3DBaseInterface
-)
+target_link_libraries     (Diligent-GraphicsEngineD3D12Interface INTERFACE Diligent-GraphicsEngineD3DBaseInterface)
+target_include_directories(Diligent-GraphicsEngineD3D12Interface INTERFACE interface)
+
 
 add_library(Diligent-GraphicsEngineD3D12-static STATIC 
     ${SRC} ${INTERFACE} ${INCLUDE} ${SHADERS}

Graphics/GraphicsEngineD3DBase/CMakeLists.txt

@@ -53,7 +53,7 @@ add_custom_command(OUTPUT ${HLSL_DEFINITIONS_INC} # We must use full path here!
 )
 
 add_library(Diligent-GraphicsEngineD3DBaseInterface INTERFACE)
-target_link_libraries(Diligent-GraphicsEngineD3DBaseInterface INTERFACE Diligent-GraphicsEngineInterface)
+target_link_libraries     (Diligent-GraphicsEngineD3DBaseInterface INTERFACE Diligent-GraphicsEngineInterface)
 target_include_directories(Diligent-GraphicsEngineD3DBaseInterface INTERFACE interface)
 
 target_include_directories(Diligent-GraphicsEngineD3DBase

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

@@ -134,14 +134,8 @@ else()
 endif()
 
 add_library(Diligent-GraphicsEngineOpenGLInterface INTERFACE)
-target_include_directories(Diligent-GraphicsEngineOpenGLInterface
-INTERFACE
-    interface
-)
-target_link_libraries(Diligent-GraphicsEngineOpenGLInterface 
-INTERFACE 
-    Diligent-GraphicsEngineInterface
-)
+target_link_libraries     (Diligent-GraphicsEngineOpenGLInterface INTERFACE Diligent-GraphicsEngineInterface)
+target_include_directories(Diligent-GraphicsEngineOpenGLInterface INTERFACE interface)
 
 
 add_library(Diligent-GraphicsEngineOpenGL-static STATIC 

Graphics/GraphicsEngineVulkan/CMakeLists.txt

@@ -148,18 +148,13 @@ add_custom_command(OUTPUT ${GENERATE_MIPS_SHADER_INC} # We must use full path he
 
 
 add_library(Diligent-GraphicsEngineVkInterface INTERFACE)
-target_include_directories(Diligent-GraphicsEngineVkInterface
-INTERFACE
-    interface
-)
-target_link_libraries(Diligent-GraphicsEngineVkInterface 
-INTERFACE 
-    Diligent-GraphicsEngineInterface
-)
+target_link_libraries     (Diligent-GraphicsEngineVkInterface INTERFACE Diligent-GraphicsEngineInterface)
+target_include_directories(Diligent-GraphicsEngineVkInterface INTERFACE interface)
+
 
 add_library(Diligent-GraphicsEngineVk-static STATIC 
     ${SRC} ${VULKAN_UTILS_SRC} ${INTERFACE} ${INCLUDE} ${VULKAN_UTILS_INCLUDE} ${GENERATE_MIPS_SHADER}
-    
+
     # A target created in the same directory (CMakeLists.txt file) that specifies any output of the 
     # custom command as a source file is given a rule to generate the file using the command at build time. 
     ${GENERATE_MIPS_SHADER_INC}

Tests/DiligentCoreAPITest/assets/shaders/ShaderResourceLayout/Samplers.hlsl

@@ -8,8 +8,6 @@ SamplerState g_SamArr_Static[STATIC_SAM_ARRAY_SIZE];  // 2
 SamplerState g_SamArr_Mut   [MUTABLE_SAM_ARRAY_SIZE]; // 4
 SamplerState g_SamArr_Dyn   [DYNAMIC_SAM_ARRAY_SIZE]; // 3
 
-SamplerState g_Sampler;
-
 #define TexRefValue float4(1.0, 0.0, 1.0, 0.0)
 
 float4 CheckValue(float4 Val, float4 Expected)