From 1da958101f1fe87686d80ac0e53916a06daddab2 Mon Sep 17 00:00:00 2001 From: Roderick Kennedy Date: Wed, 7 Aug 2024 23:04:26 +0100 Subject: [PATCH] Fixed VULKAN_SDK_DIR bug in CMake which made this variable useless. --- CMake/Shader.cmake | 1 + CMake/Variables.cmake | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMake/Shader.cmake b/CMake/Shader.cmake index d7b8c404..3d86a2ba 100644 --- a/CMake/Shader.cmake +++ b/CMake/Shader.cmake @@ -60,6 +60,7 @@ function ( add_sfx_shader_project targetName configJsonFile ) MAIN_DEPENDENCY ${in_f} WORKING_DIRECTORY ${out_folder} DEPENDS ${PLATFORM_SFX_EXECUTABLE} + COMMENT "${PLATFORM_SFX_EXECUTABLE} ${in_f} ${INCLUDE_OPTS} -O\"${out_folder}\" -P\"${configJsonFile}\" ${EXTRA_OPTS_S}" ) list(APPEND outputs${targetName} ${out_f}) else() diff --git a/CMake/Variables.cmake b/CMake/Variables.cmake index c2b2c8c8..b5505b2f 100644 --- a/CMake/Variables.cmake +++ b/CMake/Variables.cmake @@ -28,7 +28,9 @@ set_property(CACHE PLATFORM_STD_FILESYSTEM PROPERTY STRINGS 0 1 2) if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux") find_package(Vulkan REQUIRED) - set( VULKAN_SDK_DIR "{Vulkan_INCLUDE_DIR}/.." ) + set(vksdk "${Vulkan_INCLUDE_DIR}/..") + cmake_path(ABSOLUTE_PATH vksdk NORMALIZE OUTPUT_VARIABLE VULKAN_SDK_DIR) + message("VULKAN_SDK_DIR = ${VULKAN_SDK_DIR}") endif() set( PLATFORM_EMSCRIPTEN_DIR "$ENV{EMSCRIPTEN}" CACHE STRING "Set the location of the Emscripten SDK if compiling for Emscripten." )