diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-01-23 09:57:36 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-01-23 09:57:36 -0700 |
| commit | 8fc3d170de6515c0d26fb6b17bd3b5e27711e607 (patch) | |
| tree | 8150b000bc6e6667696a41ab53a10bb9b32fc6d9 | |
| parent | 4a4c64b3eaa139a7597fbe6db1a4b6721597e47b (diff) | |
| download | usermoji-8fc3d170de6515c0d26fb6b17bd3b5e27711e607.tar.xz | |
layers: Fixup cmake for new generated file deps
Change-Id: I9b5d9de6689da31907edc9ca547ae57dddee94cc
| -rw-r--r-- | layers/CMakeLists.txt | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index b035f813..d3addc9f 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -97,13 +97,13 @@ if (WIN32) ) add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def) target_link_Libraries(VkLayer_${target} VkLayer_utils) - add_dependencies(VkLayer_${target} generate_dispatch_table_helper generate_vk_helper_files VkLayer_utils) + add_dependencies(VkLayer_${target} generate_helper_files VkLayer_utils) endmacro() else() macro(add_vk_layer target) add_library(VkLayer_${target} SHARED ${ARGN}) target_link_Libraries(VkLayer_${target} VkLayer_utils) - add_dependencies(VkLayer_${target} generate_dispatch_table_helper generate_vk_helper_files VkLayer_utils) + add_dependencies(VkLayer_${target} generate_helper_files VkLayer_utils) set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,--exclude-libs,ALL") install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endmacro() @@ -114,6 +114,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../loader ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ) if (WIN32) @@ -126,27 +127,9 @@ else() set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wno-unused-function -Wno-sign-compare") endif() -add_custom_target(generate_vk_helper_files DEPENDS - vk_enum_string_helper.h - vk_struct_size_helper.h - vk_struct_size_helper.c - vk_safe_struct.h - vk_safe_struct.cpp -) - -add_custom_target(generate_dispatch_table_helper DEPENDS - vk_dispatch_table_helper.h -) - -run_vk_xml_generate(helper_file_generator.py vk_safe_struct.h) -run_vk_xml_generate(helper_file_generator.py vk_safe_struct.cpp) -run_vk_xml_generate(helper_file_generator.py vk_struct_size_helper.h) -run_vk_xml_generate(helper_file_generator.py vk_struct_size_helper.c) -run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) run_vk_xml_generate(threading_generator.py thread_check.h) run_vk_xml_generate(parameter_validation_generator.py parameter_validation.h) run_vk_xml_generate(unique_objects_generator.py unique_objects_wrappers.h) -run_vk_xml_generate(dispatch_table_generator.py vk_dispatch_table_helper.h) # Layer Utils Library # For Windows, we use a static lib because the Windows loader has a fairly restrictive loader search |