layers: link core_validation against spirv-tools

Signed-off-by: Chris Forbes <chrisforbes@google.com>

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 7d7653c..f660094 100644 (file)
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -83,7 +83,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../loader
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${GLSLANG_SPIRV_INCLUDE_DIR}
 )
 
 if (WIN32)
@@ -154,3 +153,8 @@ add_vk_layer(object_tracker object_tracker.cpp vk_layer_table.cpp)
 add_vk_layer(threading threading.cpp thread_check.h vk_layer_table.cpp)
 add_vk_layer(unique_objects unique_objects.cpp vk_layer_table.cpp vk_safe_struct.cpp)
 add_vk_layer(parameter_validation parameter_validation.cpp parameter_validation.h vk_layer_table.cpp)
+
+# Core validation has additional dependencies
+target_include_directories(VkLayer_core_validation PRIVATE ${GLSLANG_SPIRV_INCLUDE_DIR})
+target_include_directories(VkLayer_core_validation PRIVATE ${SPIRV_TOOLS_INCLUDE_DIR})
+target_link_libraries(VkLayer_core_validation ${SPIRV_TOOLS_LIB})