fix compile errors & resolve SPIRV header includes after pulling clustered rendering, force BEFORE include policy to not browse for Vulkan SDK sources

Author: AnastaZIuk

src/nbl/CMakeLists.txt

@@ -484,10 +484,10 @@ if(NBL_STATIC_BUILD)
 else()
 	target_link_libraries(Nabla PRIVATE SPIRV SPIRV-Tools SPIRV-Tools-opt)
 endif()
-target_include_directories(Nabla PUBLIC 
-	"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/include"
-	"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Tools/include"
-	"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Headers/include"
+target_include_directories(Nabla BEFORE 
+	PRIVATE "${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/include"
+	PRIVATE $<TARGET_PROPERTY:SPIRV-Tools-static,INCLUDE_DIRECTORIES>
+	PRIVATE $<TARGET_PROPERTY:SPIRV-Headers,INCLUDE_DIRECTORIES>
 )
 
 # nlohmann_json

src/nbl/asset/utils/ISPIRVOptimizer.cpp

@@ -1,7 +1,5 @@
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
-
-// quick fix to look for our SPIRV headers not from vulkan sdk
-#include "SPIRV-Tools/include/spirv-tools/optimizer.hpp"
+#include "spirv-tools/optimizer.hpp"
 
 #include "nbl/core/declarations.h"
 #include "nbl/core/IReferenceCounted.h"