From 6236f5b472a4ce92af5dc734e766e3fff618999c Mon Sep 17 00:00:00 2001 From: Fabian Sauter Date: Mon, 18 Jul 2022 12:47:53 +0200 Subject: [PATCH] Improved find_program check and errors Signed-off-by: Fabian Sauter --- cmake/check_vulkan_version.cmake | 6 +++--- cmake/vulkan_shader_compiler.cmake | 2 +- config/FindSphinx.cmake | 14 +++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cmake/check_vulkan_version.cmake b/cmake/check_vulkan_version.cmake index ec69c104..34d9fd90 100644 --- a/cmake/check_vulkan_version.cmake +++ b/cmake/check_vulkan_version.cmake @@ -41,12 +41,12 @@ function(check_vulkan_version) message(FATAL_ERROR "Invalid Vulkan include directory given. Try calling 'find_package(Vulkan REQUIRED)' before you call this function or set 'Vulkan_INCLUDE_DIR' manually!") return() endif() - message(STATUS "Found Vulkan Header version ${VULKAN_HEADER_VERSION}.") + message(STATUS "Found Vulkan Header version: ${VULKAN_HEADER_VERSION}") # Get Vulkan version supported by driver find_program(VULKAN_INFO_PATH NAMES vulkaninfo) - if(${VULKAN_INFO_PATH}) - message(FATAL_ERROR "vulkaninfo not found. The Vulkan SDK might not be installed properly.") + if(VULKAN_INFO_PATH STREQUAL "VULKAN_INFO_PATH-NOTFOUND") + message(FATAL_ERROR "vulkaninfo not found. The Vulkan SDK might not be installed properly. If you know what you are doing, you can disable the Vulkan version check by setting 'KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK' to 'ON'. (-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON)") return() endif() diff --git a/cmake/vulkan_shader_compiler.cmake b/cmake/vulkan_shader_compiler.cmake index 7c10cc83..acc27b57 100644 --- a/cmake/vulkan_shader_compiler.cmake +++ b/cmake/vulkan_shader_compiler.cmake @@ -1,6 +1,6 @@ function(vulkan_compile_shader) find_program(GLS_LANG_VALIDATOR_PATH NAMES glslangValidator) - if(${GLS_LANG_VALIDATOR_PATH}) + if(GLS_LANG_VALIDATOR_PATH STREQUAL "GLS_LANG_VALIDATOR_PATH-NOTFOUND") message(FATAL_ERROR "glslangValidator not found.") return() endif() diff --git a/config/FindSphinx.cmake b/config/FindSphinx.cmake index 017ef172..c645ccc9 100644 --- a/config/FindSphinx.cmake +++ b/config/FindSphinx.cmake @@ -1,11 +1,15 @@ - -#Look for an executable called sphinx-build +# Look for an executable called sphinx-build find_program(SPHINX_EXECUTABLE - NAMES sphinx-build - DOC "Path to sphinx-build executable") + NAMES sphinx-build + DOC "Path to sphinx-build executable") + +if(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND") + message(FATAL_ERROR "sphinx-build not found.") +endif() include(FindPackageHandleStandardArgs) -#Handle standard arguments to find_package like REQUIRED and QUIET + +# Handle standard arguments to find_package like REQUIRED and QUIET find_package_handle_standard_args( Sphinx "Failed to find sphinx-build executable"