From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Sat, 25 Dec 2021 00:48:09 +0000 (+0100)
Subject: remove local FindVulkan, update cmake min version to 3.21 for android compatibility
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=575aaf77feca1bb15d8aa245c9a64b209f3b8ac1;p=jp%2Fvkhelpers.git

remove local FindVulkan, update cmake min version to 3.21 for android compatibility
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc4f506..3ff00e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.21)
 
 OPTION(VKH_ENABLE_VMA "enable Vulkan Memory Allocator" ON)
 if (VKH_ENABLE_VMA)
@@ -6,6 +6,7 @@ if (VKH_ENABLE_VMA)
 ELSE()
 	SET(LANG "C")
 ENDIF()
+SET(CMAKE_CXX_STANDARD 11)
 
 PROJECT(vkh VERSION 0.1.0 DESCRIPTION "Vulkan helpers library" LANGUAGES ${LANG})
 
@@ -46,21 +47,6 @@ IF (ENABLE_VALIDATION)
 	ADD_DEFINITIONS (-DVKH_USE_VALIDATION)
 ENDIF ()
 
-if (NOT VULKAN_SDK)
-	set(VULKAN_SDK "$ENV{VULKAN_SDK}" CACHE STRING "LunarG Vulkan SDK path")
-	if (VULKAN_SDK)
-			set(ENV{VULKAN_SDK} ${VULKAN_SDK})
-			SET(vulkanSdkLayerPath "${VULKAN_SDK}/etc/vulkan/explicit_layer.d")
-			IF (NOT EXISTS "${vulkanSdkLayerPath}")
-				SET(vulkanSdkLayerPath "${VULKAN_SDK}/etc/explicit_layer.d")
-			endif ()
-			SET(ENV{VK_LAYER_PATH} "${vulkanSdkLayerPath}")
-	endif ()
-endif ()
-
-MESSAGE(STATUS "VULKAN_SDK = $ENV{VULKAN_SDK}")
-MESSAGE(STATUS "VK_LAYER_PATH = $ENV{VK_LAYER_PATH}")
-
 FIND_PACKAGE(Vulkan REQUIRED)
 
 INCLUDE(GNUInstallDirs)
diff --git a/cmake/FindVulkan.cmake b/cmake/FindVulkan.cmake
deleted file mode 100644
index 64a6b33..0000000
--- a/cmake/FindVulkan.cmake
+++ /dev/null
@@ -1,88 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindVulkan
-# ----------
-#
-# Try to find Vulkan
-#
-# IMPORTED Targets
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines :prop_tgt:`IMPORTED` target ``Vulkan::Vulkan``, if
-# Vulkan has been found.
-#
-# Result Variables
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines the following variables::
-#
-#   Vulkan_FOUND          - True if Vulkan was found
-#   Vulkan_INCLUDE_DIRS   - include directories for Vulkan
-#   Vulkan_LIBRARIES      - link against this library to use Vulkan
-#
-# The module will also define two cache variables::
-#
-#   Vulkan_INCLUDE_DIR    - the Vulkan include directory
-#   Vulkan_LIBRARY        - the path to the Vulkan library
-#
-
-if(WIN32)
-  find_path(Vulkan_INCLUDE_DIR
-    NAMES vulkan/vulkan.h
-    PATHS
-      "$ENV{VULKAN_SDK}/Include"
-    )
-
-  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    find_library(Vulkan_LIBRARY
-      NAMES vulkan-1
-      PATHS
-        "$ENV{VULKAN_SDK}/Lib"
-        "$ENV{VULKAN_SDK}/Bin"
-        )
-  elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    find_library(Vulkan_LIBRARY
-      NAMES vulkan-1
-      PATHS
-        "$ENV{VULKAN_SDK}/Lib32"
-        "$ENV{VULKAN_SDK}/Bin32"
-        NO_SYSTEM_ENVIRONMENT_PATH
-        )
-  endif()
-else()
-    find_path(Vulkan_INCLUDE_DIR
-      NAMES vulkan/vulkan.h
-      PATHS
-      "$ENV{VULKAN_SDK}/include" NO_DEFAULT_PATH)
-    find_library(Vulkan_LIBRARY
-      NAMES vulkan
-      PATHS
-      "$ENV{VULKAN_SDK}/lib" NO_DEFAULT_PATH)
-    find_path(Vulkan_INCLUDE_DIR
-      NAMES vulkan/vulkan.h
-      PATHS
-      "$ENV{VULKAN_SDK}/include")
-    find_library(Vulkan_LIBRARY
-      NAMES vulkan
-      PATHS
-      "$ENV{VULKAN_SDK}/lib")
-endif()
-
-set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})
-set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Vulkan
-  DEFAULT_MSG
-  Vulkan_LIBRARY Vulkan_INCLUDE_DIR)
-
-mark_as_advanced(Vulkan_INCLUDE_DIR Vulkan_LIBRARY)
-
-if(Vulkan_FOUND AND NOT TARGET Vulkan::Vulkan)
-  add_library(Vulkan::Vulkan UNKNOWN IMPORTED)
-  set_target_properties(Vulkan::Vulkan PROPERTIES
-    IMPORTED_LOCATION "${Vulkan_LIBRARIES}"
-    INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
-endif()