CMakeLists.txt
changeset 11367 e8fc755a89e8
parent 11365 a9bd2625fa01
child 11378 dc769c104554
     1.1 --- a/CMakeLists.txt	Sun Aug 27 19:32:08 2017 -0700
     1.2 +++ b/CMakeLists.txt	Sun Aug 27 23:25:12 2017 -0400
     1.3 @@ -329,10 +329,6 @@
     1.4  set_option(VIDEO_KMSDRM        "Use KMS DRM video driver" ${UNIX_SYS})
     1.5  dep_option(KMSDRM_SHARED       "Dynamically load KMS DRM support" ON "VIDEO_KMSDRM" OFF)
     1.6  
     1.7 -if(VIDEO_VULKAN)
     1.8 -  set(VULKAN_SDK $ENV{VULKAN_SDK} CACHE PATH "Location of Vulkan headers' grandparent, e.g. /foo when headers are in /foo/include/vulkan.")
     1.9 -endif()
    1.10 -
    1.11  # TODO: We should (should we?) respect cmake's ${BUILD_SHARED_LIBS} flag here
    1.12  # The options below are for compatibility to configure's default behaviour.
    1.13  set(SDL_SHARED ${SDL_SHARED_ENABLED_BY_DEFAULT} CACHE BOOL "Build a shared version of the library")
    1.14 @@ -874,8 +870,6 @@
    1.15      if(NOT VULKAN_PASSED_ANDROID_CHECKS)
    1.16        set(VIDEO_VULKAN OFF)
    1.17        message(STATUS "Vulkan doesn't work on this configuration")
    1.18 -    else()
    1.19 -      CheckVulkanHeaders()
    1.20      endif()
    1.21    endif()
    1.22  
    1.23 @@ -1041,8 +1035,6 @@
    1.24      endif()
    1.25  
    1.26      check_include_file("fcitx/frontend.h" HAVE_FCITX_FRONTEND_H)
    1.27 -
    1.28 -    CheckVulkanHeaders()
    1.29    endif()
    1.30  
    1.31    if(INPUT_TSLIB)
    1.32 @@ -1301,8 +1293,6 @@
    1.33        set(SDL_VIDEO_RENDER_OGL_ES2 1)
    1.34        set(HAVE_VIDEO_OPENGLES TRUE)
    1.35      endif()
    1.36 -
    1.37 -    CheckVulkanHeaders()
    1.38    endif()
    1.39  
    1.40    if(SDL_JOYSTICK)
    1.41 @@ -1445,11 +1435,8 @@
    1.42  
    1.43    # Actually load the frameworks at the end so we don't duplicate include.
    1.44    if (VIDEO_VULKAN)
    1.45 -    CheckVulkanHeaders()
    1.46 -    if(HAVE_VULKAN_H)
    1.47 -      find_library(QUARTZCORE QuartzCore)
    1.48 -      list(APPEND EXTRA_LIBS ${QUARTZCORE})
    1.49 -    endif()
    1.50 +    find_library(QUARTZCORE QuartzCore)
    1.51 +    list(APPEND EXTRA_LIBS ${QUARTZCORE})
    1.52    endif()
    1.53    if(SDL_FRAMEWORK_COREVIDEO)
    1.54      find_library(COREVIDEO CoreVideo)
    1.55 @@ -1530,7 +1517,7 @@
    1.56    CheckPTHREAD()
    1.57  endif()
    1.58  
    1.59 -if(VIDEO_VULKAN AND HAVE_VULKAN_H AND (NOT APPLE OR QUARTZCORE))
    1.60 +if(VIDEO_VULKAN AND (NOT APPLE OR QUARTZCORE))
    1.61    set(SDL_VIDEO_VULKAN_SURFACE 1)
    1.62  endif()
    1.63