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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee3d8a95ca00818ab568f4a4eeb894f25c9a4247..0c2c816fc6b65fbda0db4f9436626ea0e0718386 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.21)
 
 SET(LANG "CXX")
 SET(CMAKE_CXX_STANDARD 11)
@@ -42,8 +42,10 @@ ELSE()
        UNSET(ENABLE_VALIDATION CACHE)
        UNSET(ENABLE_DBG_UTILS CACHE)
        UNSET(ENABLE_WIRED_FILL CACHE)
-       IF (UNIX)
-               SET(CMAKE_${LANG}_FLAGS  "${CMAKE_CXX_FLAGS} -O3 -march=native -w -ansi -pedantic")
+       IF (ANDROID)
+               SET(CMAKE_${LANG}_FLAGS  "${CMAKE_CXX_FLAGS} -O3 -w -ansi -pedantic")
+       ELSEIF (UNIX)
+               SET(CMAKE_${LANG}_FLAGS  "${CMAKE_CXX_FLAGS} -O3 -w -ansi -pedantic")
        ELSEIF(MSVC)
                SET(CMAKE_${LANG}_FLAGS "${CMAKE_CXX_FLAGS} /O2 /TC /W0")
        ENDIF()
@@ -69,17 +71,6 @@ IF (VKVG_DBG_STATS)
        ADD_DEFINITIONS (-DVKVG_DBG_STATS)
 ENDIF ()
 
-
-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 ()
-
 IF (NOT TARGET vkh_static)
        ADD_SUBDIRECTORY (vkh)
 ENDIF()
@@ -285,6 +276,7 @@ IF (VKVG_BUILD_DOCS)
 ENDIF (VKVG_BUILD_DOCS)
 
 MESSAGE(STATUS "VKVG_PUBLIC_HEADERS = ${VKVG_PUBLIC_HEADERS}")
+MESSAGE(STATUS "Vulkan_LIBRARIES = ${Vulkan_LIBRARIES}")
 
 MESSAGE(STATUS "VKVG version\t\t= ${vkvg_VERSION_MAJOR}.${vkvg_VERSION_MINOR}.${vkvg_VERSION_PATCH}")
 MESSAGE(STATUS "comp flags\t\t= ${CMAKE_${LANG}_FLAGS}")

diff --git a/cmake/FindVulkan.cmake b/cmake/FindVulkan.cmake
deleted file mode 100644 (file)
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()

diff --git a/vkh b/vkh
index fc5623d771907a94b0d68da221703a6ca6088885..575aaf77feca1bb15d8aa245c9a64b209f3b8ac1 160000 (submodule)
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit fc5623d771907a94b0d68da221703a6ca6088885
+Subproject commit 575aaf77feca1bb15d8aa245c9a64b209f3b8ac1