[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-747-g8324210

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  83242107ad6514dff6a8b6946467838f4d4104be (commit)
       via  8e58f360f53eab991debe507c669595cec7f07fa (commit)
      from  3bf5d33ba90dc3478a928f47507e004d905b7d87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83242107ad6514dff6a8b6946467838f4d4104be
commit 83242107ad6514dff6a8b6946467838f4d4104be
Merge: 3bf5d33 8e58f36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 2 10:03:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 2 10:03:46 2017 -0500

    Merge topic 'FindVulkan-update' into next
    
    8e58f360 FindVulkan: Update for LunarG SDK import library location on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e58f360f53eab991debe507c669595cec7f07fa
commit 8e58f360f53eab991debe507c669595cec7f07fa
Author:     Brad Davis <bdavis at saintandreas.org>
AuthorDate: Wed Mar 1 17:56:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 2 10:02:20 2017 -0500

    FindVulkan: Update for LunarG SDK import library location on Windows
    
    As of at least 1.0.42 of the LunarG SDK, the `vulkan-1.lib` import
    library on Windows is stored in `${VULKAN_SDK}/Lib` or
    `${VULKAN_SDK}/Lib32`.

diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake
index 820e0eb..0be9f97 100644
--- a/Modules/FindVulkan.cmake
+++ b/Modules/FindVulkan.cmake
@@ -39,12 +39,16 @@ if(WIN32)
     find_library(Vulkan_LIBRARY
       NAMES vulkan-1
       PATHS
-        "$ENV{VULKAN_SDK}/Bin")
+        "$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}/Bin32")
+        "$ENV{VULKAN_SDK}/Lib32"
+        "$ENV{VULKAN_SDK}/Bin32"
+        )
   endif()
 else()
     find_path(Vulkan_INCLUDE_DIR

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindVulkan.cmake |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake