aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2018-05-10 21:00:28 -0600
committerMark Lobodzinski <mark@lunarg.com>2018-05-11 20:11:48 -0600
commit4f3af32e9d30aafe8dcd9943c84f2ed7730a497c (patch)
tree3d2cf7e5c8a03e932fb28b5f619ba1df31a4d92a
parent072e854b49ff056d814f22a395070437446b89a9 (diff)
downloadusermoji-4f3af32e9d30aafe8dcd9943c84f2ed7730a497c.tar.xz
headers: Switched cmake files to Vulkan-Headers
-rw-r--r--CMakeLists.txt4
-rw-r--r--icd/CMakeLists.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98295b0e..6ecf42a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(TOOLS_TARGET_FOLDER lvl_cmake_targets)
# Header file for CMake settings
-include_directories("${PROJECT_SOURCE_DIR}/include")
+include_directories("${PROJECT_SOURCE_DIR}/Vulkan-Headers/include")
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
@@ -60,7 +60,7 @@ option(BUILD_ICD "Build icd" ON)
if(UNIX)
if(INSTALL_LVL_FILES)
- install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(DIRECTORY "${PROJECT_SOURCE_DIR}/Vulkan-Headers/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
endif()
# uninstall target
diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
index acc82eee..ea853e4b 100644
--- a/icd/CMakeLists.txt
+++ b/icd/CMakeLists.txt
@@ -147,7 +147,7 @@ endif()
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../loader
- ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
+ ${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include/vulkan
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_BINARY_DIR}
${CMAKE_BINARY_DIR}