Merge pull request #723 from dj2/cmake

Fixup usage of CMake variables.
This commit is contained in:
Andreas Süßenbach 2020-08-25 09:19:47 +02:00 committed by GitHub
commit 724bbb2a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -62,7 +62,7 @@ message("CMAKE_CXX_STANDARD = <${CMAKE_CXX_STANDARD}>")
if (NOT DEFINED VulkanRegistry_DIR) if (NOT DEFINED VulkanRegistry_DIR)
if (DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR) if (DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR)
set(VulkanRegistry_DIR VULKAN_HPP_VULKAN_HEADERS_SRC_DIR) set(VulkanRegistry_DIR ${VULKAN_HPP_VULKAN_HEADERS_SRC_DIR})
else() else()
set(VulkanRegistry_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") set(VulkanRegistry_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
endif() endif()
@ -73,7 +73,7 @@ add_definitions(-DVK_SPEC="${vk_spec}")
if (NOT DEFINED VulkanHeaders_INCLUDE_DIR) if (NOT DEFINED VulkanHeaders_INCLUDE_DIR)
if (DEFINED VULKAN_HPP_PATH) if (DEFINED VULKAN_HPP_PATH)
set(VulkanHeaders_INCLUDE_DIR VULKAN_HPP_PATH) set(VulkanHeaders_INCLUDE_DIR ${VULKAN_HPP_PATH})
else() else()
set(VulkanHeaders_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(VulkanHeaders_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
endif() endif()