configure_mac.cmake: Update to Vulkan SDK 1.2.182.0

DrBenson · Jul 12, 2021 · 44d019e · 44d019e
1 parent ed73fcd
commit 44d019e
Showing 1 changed file with 44 additions and 4 deletions.
diff --git a/configure_mac.cmake b/configure_mac.cmake
@@ -17,10 +17,10 @@ set(VCPKG_COMMIT_SHA "6e024e744e7717c06ddacd5089401109c6298553")
 set(MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET "10.10")
 
 # Vulkan SDK
-set(VULKAN_SDK_VERSION "1.2.170.0")
+set(VULKAN_SDK_VERSION "1.2.182.0")
 set(VULKAN_SDK_DL_FILENAME "vulkansdk-macos-${VULKAN_SDK_VERSION}.dmg")
 set(VULKAN_SDK_DL_URL "https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/mac/${VULKAN_SDK_DL_FILENAME}?Human=true")
-set(VULKAN_SDK_DL_SHA256 "5c7264a66c57918f617d2b62dc062fd8c0a671915819b4c9420cd431e7808729")
+set(VULKAN_SDK_DL_SHA256 "9e89291283e41d62673bf48007dac764e99a504d145ee4d70d2d32e328f7ee40")
 
 ########################################################
 
@@ -65,7 +65,7 @@ if((CMAKE_HOST_SYSTEM_NAME MATCHES "^Darwin$") AND (DARWIN_VERSION VERSION_GREAT
 	endif()
 	execute_process(COMMAND ${CMAKE_COMMAND} -E echo "++ Download Vulkan SDK...")
 
-	set(_vulkan_sdk_out_dir "vulkansdk-macos")
+	set(_vulkan_sdk_out_dir "vulkansdk-macos-dl")
 
 	execute_process(
 		COMMAND ${CMAKE_COMMAND}
@@ -80,13 +80,53 @@ if((CMAKE_HOST_SYSTEM_NAME MATCHES "^Darwin$") AND (DARWIN_VERSION VERSION_GREAT
 	if(NOT _exstatus EQUAL 0)
 		message(FATAL_ERROR "Failed to download Vulkan SDK")
 	endif()
+	set(_full_vulkan_dl_path "${CMAKE_CURRENT_SOURCE_DIR}/macosx/external/${_vulkan_sdk_out_dir}")
+
+	if(DEFINED ENV{GITHUB_ACTIONS} AND "$ENV{GITHUB_ACTIONS}" STREQUAL "true")
+		execute_process(COMMAND ${CMAKE_COMMAND} -E echo "::endgroup::")
+	endif()
+
+	if(DEFINED ENV{GITHUB_ACTIONS} AND "$ENV{GITHUB_ACTIONS}" STREQUAL "true")
+		execute_process(COMMAND ${CMAKE_COMMAND} -E echo "::group::Extract Vulkan SDK")
+	endif()
+	execute_process(COMMAND ${CMAKE_COMMAND} -E echo "++ Extract Vulkan SDK...")
+
+	set(_full_vulkan_install_path "${CMAKE_CURRENT_SOURCE_DIR}/macosx/external/vulkansdk-macos")
+	if(EXISTS "${_full_vulkan_install_path}/.SHA256SumLoc")
+		file(READ "${_full_vulkan_install_path}/.SHA256SumLoc" _strings_existing_sha256 ENCODING UTF-8)
+	endif()
+
+	if(NOT DEFINED _strings_existing_sha256 OR NOT _strings_existing_sha256 STREQUAL VULKAN_SDK_DL_SHA256)
+		# Not the expected version / content, or not yet extracted
+		if(EXISTS "${_full_vulkan_install_path}")
+			file(REMOVE_RECURSE "${_full_vulkan_install_path}")
+		endif()
+	endif()
+	unset(_strings_existing_sha256)
+
+	# ./InstallVulkan.app/Contents/MacOS/InstallVulkan --root ${_full_vulkan_install_path} --accept-licenses --default-answer --confirm-command install --copy_only=1
+	execute_process(
+		COMMAND ./InstallVulkan.app/Contents/MacOS/InstallVulkan
+				--root ${_full_vulkan_install_path}
+				--accept-licenses
+				--default-answer
+				--confirm-command install
+				copy_only=1
+		WORKING_DIRECTORY "${_full_vulkan_dl_path}"
+		RESULT_VARIABLE _exstatus
+	)
+	if(NOT _exstatus EQUAL 0)
+		message(FATAL_ERROR "Failed to extract Vulkan SDK (exit code: ${_exstatus})")
+	endif()
+
+	file(WRITE "${_full_vulkan_install_path}/.SHA256SumLoc" "${VULKAN_SDK_DL_SHA256}")
 
 	if(DEFINED ENV{GITHUB_ACTIONS} AND "$ENV{GITHUB_ACTIONS}" STREQUAL "true")
 		execute_process(COMMAND ${CMAKE_COMMAND} -E echo "::endgroup::")
 	endif()
 
 	# Set VULKAN_SDK environment variable, so vcpkg and CMake pick up the appropriate location
-	set(ENV{VULKAN_SDK} "${CMAKE_CURRENT_SOURCE_DIR}/macosx/external/${_vulkan_sdk_out_dir}/macOS")
+	set(ENV{VULKAN_SDK} "${_full_vulkan_install_path}/macOS")
 	message(STATUS "VULKAN_SDK=$ENV{VULKAN_SDK}")
 	if(NOT IS_DIRECTORY "$ENV{VULKAN_SDK}")
 		message(FATAL_ERROR "Something went wrong - expected Vulkan SDK output directory does not exist: $ENV{VULKAN_SDK}")