diff options
| author | Lenny Komow <lenny@lunarg.com> | 2019-08-05 10:47:21 -0600 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2019-08-08 09:47:34 -0600 |
| commit | 51c0866993db3ee0515813c9a9cac39388e08aec (patch) | |
| tree | 80b10f554e601e59fb94b04f91246d1ebda1bc54 | |
| parent | 5f56bb19807453b3fc1f9d1084512f2766e22ee3 (diff) | |
| download | vulkan-tools-51c0866993db3ee0515813c9a9cac39388e08aec.tar.gz | |
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
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | external/x64/lib/vulkan-1.lib | bin | 0 -> 48602 bytes | |||
| -rw-r--r-- | external/x86/lib/vulkan-1.lib | bin | 0 -> 52334 bytes | |||
| -rw-r--r-- | scripts/known_good.json | 4 |
4 files changed, 11 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aaa8696..ec399d68 100644 --- 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 Binary files differnew file mode 100644 index 00000000..3e23a7bc --- /dev/null +++ b/external/x64/lib/vulkan-1.lib diff --git a/external/x86/lib/vulkan-1.lib b/external/x86/lib/vulkan-1.lib Binary files differnew file mode 100644 index 00000000..3caa7ba0 --- /dev/null +++ b/external/x86/lib/vulkan-1.lib diff --git a/scripts/known_good.json b/scripts/known_good.json index 97811d57..ccb4dec1 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -50,6 +50,10 @@ ], "cmake_options" : [ "-DBUILD_TESTS=NO" + ], + "build_platforms" : [ + "linux", + "darwin" ] } ], |