diff options
| -rw-r--r-- | layers/CMakeLists.txt | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 82e1495a..bb86f939 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -1,24 +1,24 @@ cmake_minimum_required (VERSION 2.8.11) macro(run_vk_helper subcmd) - add_custom_command(OUTPUT ${ARGN} - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${PROJECT_SOURCE_DIR}/vk_helper.py ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h - ) + add_custom_command(OUTPUT ${ARGN} + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${PROJECT_SOURCE_DIR}/vk_helper.py ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h + ) endmacro() macro(run_vk_layer_generate subcmd output) - add_custom_command(OUTPUT ${output} - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${DisplayServer} ${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h > ${output} - DEPENDS ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h ${PROJECT_SOURCE_DIR}/vulkan.py - ) + add_custom_command(OUTPUT ${output} + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${DisplayServer} ${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h > ${output} + DEPENDS ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h ${PROJECT_SOURCE_DIR}/vulkan.py + ) endmacro() macro(run_vk_layer_xml_generate subcmd output) - add_custom_command(OUTPUT ${output} - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/genvk.py -registry ${PROJECT_SOURCE_DIR}/vk.xml ${output} - DEPENDS ${PROJECT_SOURCE_DIR}/vk.xml ${PROJECT_SOURCE_DIR}/generator.py ${PROJECT_SOURCE_DIR}/genvk.py ${PROJECT_SOURCE_DIR}/reg.py - ) + add_custom_command(OUTPUT ${output} + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/genvk.py -registry ${PROJECT_SOURCE_DIR}/vk.xml ${output} + DEPENDS ${PROJECT_SOURCE_DIR}/vk.xml ${PROJECT_SOURCE_DIR}/generator.py ${PROJECT_SOURCE_DIR}/genvk.py ${PROJECT_SOURCE_DIR}/reg.py + ) endmacro() set(LAYER_JSON_FILES VkLayer_core_validation @@ -59,32 +59,32 @@ endif() if (WIN32) macro(add_vk_layer target) - add_custom_command(OUTPUT VkLayer_${target}.def - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py ${DisplayServer} win-def-file VkLayer_${target} layer > VkLayer_${target}.def - DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py - ) - add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def) + add_custom_command(OUTPUT VkLayer_${target}.def + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py ${DisplayServer} win-def-file VkLayer_${target} layer > VkLayer_${target}.def + DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py + ) + add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def) target_link_Libraries(VkLayer_${target} layer_utils) - add_dependencies(VkLayer_${target} layer_utils_static) - add_dependencies(VkLayer_${target} generate_vk_layer_helpers) - set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/VkLayer_${target}.def") + add_dependencies(VkLayer_${target} layer_utils_static) + add_dependencies(VkLayer_${target} generate_vk_layer_helpers) + set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/VkLayer_${target}.def") endmacro() else() macro(add_vk_layer target) - add_library(VkLayer_${target} SHARED ${ARGN}) + add_library(VkLayer_${target} SHARED ${ARGN}) target_link_Libraries(VkLayer_${target} layer_utils) - add_dependencies(VkLayer_${target} generate_vk_layer_helpers) - set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") - install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) + add_dependencies(VkLayer_${target} generate_vk_layer_helpers) + set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") + install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) endmacro() endif() include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../loader - ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan - ${CMAKE_CURRENT_BINARY_DIR} - ${GLSLANG_SPIRV_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../loader + ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan + ${CMAKE_CURRENT_BINARY_DIR} + ${GLSLANG_SPIRV_INCLUDE_DIR} ) if (WIN32) @@ -100,34 +100,34 @@ if (NOT WIN32) endif() add_custom_command(OUTPUT vk_dispatch_table_helper.h - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py ${DisplayServer} dispatch-table-ops layer > vk_dispatch_table_helper.h - DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py ${DisplayServer} dispatch-table-ops layer > vk_dispatch_table_helper.h + DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) run_vk_helper(gen_enum_string_helper vk_enum_string_helper.h) run_vk_helper(gen_struct_wrappers - vk_struct_string_helper.h + vk_struct_string_helper.h vk_struct_string_helper_cpp.h - vk_struct_string_helper_no_addr.h - vk_struct_string_helper_no_addr_cpp.h + vk_struct_string_helper_no_addr.h + vk_struct_string_helper_no_addr_cpp.h vk_struct_size_helper.h vk_struct_size_helper.c - vk_struct_wrappers.h - vk_struct_wrappers.cpp + vk_struct_wrappers.h + vk_struct_wrappers.cpp vk_safe_struct.h vk_safe_struct.cpp ) add_custom_target(generate_vk_layer_helpers DEPENDS - vk_dispatch_table_helper.h - vk_enum_string_helper.h - vk_struct_string_helper.h - vk_struct_string_helper_no_addr.h + vk_dispatch_table_helper.h + vk_enum_string_helper.h + vk_struct_string_helper.h + vk_struct_string_helper_no_addr.h vk_struct_string_helper_cpp.h - vk_struct_string_helper_no_addr_cpp.h + vk_struct_string_helper_no_addr_cpp.h vk_struct_size_helper.h vk_struct_size_helper.c - vk_struct_wrappers.h - vk_struct_wrappers.cpp + vk_struct_wrappers.h + vk_struct_wrappers.cpp vk_safe_struct.h vk_safe_struct.cpp ) |