build: Remove Windows loader build dependency

On Windows, the loader now has a dependency on the Windows Driver Kit.
In order to avoid adding that dependency here, this change includes
loader .lib files for building on Windows.

Change-Id: I3119caccf7e4e9ba0666a9ba29413137696775ec

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aaa869..ec399d6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,13 @@ endif()
 # ~~~
 set(VULKAN_HEADERS_INSTALL_DIR "HEADERS-NOTFOUND" CACHE PATH "Absolute path to a Vulkan-Headers install directory")
 set(VULKAN_LOADER_INSTALL_DIR "LOADER-NOTFOUND" CACHE PATH "Absolute path to a Vulkan-Loader install directory")
+if(WIN32 AND "${VULKAN_LOADER_INSTALL_DIR}" STREQUAL "LOADER-NOTFOUND")
+    if(CMAKE_CL_64)
+        set(VULKAN_LOADER_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/x64")
+    else()
+        set(VULKAN_LOADER_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/x86")
+    endif()
+endif()
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};${VULKAN_HEADERS_INSTALL_DIR};${VULKAN_LOADER_INSTALL_DIR};
     $ENV{VULKAN_HEADERS_INSTALL_DIR};$ENV{VULKAN_LOADER_INSTALL_DIR})
 

diff --git a/external/x64/lib/vulkan-1.lib b/external/x64/lib/vulkan-1.lib
new file mode 100644 (file)
index 0000000..3e23a7b
Binary files /dev/null and b/external/x64/lib/vulkan-1.lib differ

diff --git a/external/x86/lib/vulkan-1.lib b/external/x86/lib/vulkan-1.lib
new file mode 100644 (file)
index 0000000..3caa7ba
Binary files /dev/null and b/external/x86/lib/vulkan-1.lib differ

diff --git a/scripts/known_good.json b/scripts/known_good.json
index 97811d5..ccb4dec 100644 (file)
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -50,6 +50,10 @@
       ],
       "cmake_options" : [
         "-DBUILD_TESTS=NO"
+      ],
+      "build_platforms" : [
+        "linux",
+        "darwin"
       ]
     }
   ],