diff options
| author | Karl Schultz <karl@lunarg.com> | 2018-06-05 14:21:36 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2018-06-06 09:34:51 -0600 |
| commit | 18119079d3d20f94639dae9c28830b85dfc16d90 (patch) | |
| tree | ad3bf2a1b318673b99cb603926a69e40a821e091 /icd | |
| parent | 917949c3da5f3bfc21c1560e20935be65637340f (diff) | |
| download | vulkan-tools-18119079d3d20f94639dae9c28830b85dfc16d90.tar.gz | |
repo: Reorg to remove Vulkan-Headers submodule
- Remove Vulkan-Headers submodule
- Add CMake code to add VULKAN_HEADERS_INSTALL_DIR and
VULKAN_LOADER_INSTALL_DIR to search when locating
Vulkan headers and loader
- CI adjustments for new model
- BUILD.md updates
- Travis-CI Android build temporarily disabled
Fixes #20
Diffstat (limited to 'icd')
| -rw-r--r-- | icd/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt index d3ed5909..8f695071 100644 --- a/icd/CMakeLists.txt +++ b/icd/CMakeLists.txt @@ -160,8 +160,7 @@ endif() include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../loader - ${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include/vulkan + ${Vulkan_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR} |