address comments

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Author: pollend

3rdparty/dxc/CMakeLists.txt

@@ -1,5 +1,5 @@
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_OPTIONAL_PROJS_IN_DEFAULT:BOOL=OFF")
-# list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_ANALYZE:BOOL=OFF")
+list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_ANALYZE:BOOL=OFF")
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_OFFICIAL_BUILD:BOOL=OFF")
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_FIXED_VER:BOOL=OFF")
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_FIXED_VERSION_LOCATION:STRING=")
@@ -60,28 +60,38 @@ else()
 endif()
 
 set(DXC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CACHE INTERNAL "")
-# execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}"-D CMAKE_BUILD_TYPE:STRING=Debug   ${NBL_DXC_CMAKE_OPTIONS}
-# 	RESULT_VARIABLE DXC_CMAKE_RESULT
-# 	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
-# )
+
+if(WIN32)
+execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
+	RESULT_VARIABLE DXC_CMAKE_RESULT
+	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+)
+
+else()
 
 execute_process(COMMAND "${CMAKE_COMMAND}" 
 	-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
 	-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
-	-D "CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE" 
-	-D "CMAKE_BUILD_TYPE:STRING=Debug" 
-	-D "CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc" 
-	-D "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++"
+	-G "${CMAKE_GENERATOR}" 
+	-T "${CMAKE_GENERATOR_TOOLSET}"
 	-B "${DXC_BUILD_DIR}" 
-	-G "Ninja"
+	-D "CMAKE_BUILD_TYPE:STRING=Debug"
 	RESULT_VARIABLE DXC_CMAKE_RESULT
 	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
 )
 
-# execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
-# 	RESULT_VARIABLE DXC_CMAKE_RESULT
-# 	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
-# )
+execute_process(COMMAND "${CMAKE_COMMAND}" 
+	-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
+	-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
+	-G "${CMAKE_GENERATOR}" 
+	-T "${CMAKE_GENERATOR_TOOLSET}"
+	-B "${DXC_BUILD_DIR}" 
+	-D "CMAKE_BUILD_TYPE:STRING=Release"
+	RESULT_VARIABLE DXC_CMAKE_RESULT
+	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+)
+endif()
+
 
 if(NOT "${DXC_CMAKE_RESULT}" STREQUAL "0")
 	message(FATAL_ERROR "${DXC_CMAKE_STREAM_PIPE}")
@@ -126,8 +136,8 @@ if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
 	add_subdirectory(CT CT)
 endif()
 
-# include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/debug.cmake")
-# include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/release.cmake")
+include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/debug.cmake")
+include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/release.cmake")
 
 set(DXC_INCLUDE_DIRECTORIES
 	$<IF:$<CONFIG:Debug>,${NBL_DXC_DEBUG_INCLUDE_DIRECTORIES},${NBL_DXC_RELEASE_INCLUDE_DIRECTORIES}>

include/nbl/core/execution.h

@@ -5,7 +5,7 @@
 #ifndef _NBL_CORE_EXECUTION_H_INCLUDED_
 #define _NBL_CORE_EXECUTION_H_INCLUDED_
 
-#ifndef _NBL_BUILD_DPL_
+#if __has_include (<execution>)
 #include <execution>
 #include <algorithm>
 #else
@@ -26,7 +26,7 @@ inline auto highLevelF(Args&&... args) -> decltype(lowLevelF(std::forward<Args>(
 
 namespace nbl::core
 {
-#ifndef _NBL_BUILD_DPL_
+#if __has_include(<execution>)
 namespace execution = std::execution;
 
 ALIAS_TEMPLATE_FUNCTION(for_each_n, std::for_each_n)