diff options
| author | Mun, Gwan-gyeong <kk.moon@samsung.com> | 2016-02-22 11:02:58 +0900 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-02-29 08:27:10 -0700 |
| commit | 041fd95ce9ff0ff9cff00a719412172d4801a9f2 (patch) | |
| tree | 9d92a235df4c13a1a51cfad1c83256a65be8d591 | |
| parent | 79b467eb9cfa3e1d9ed7f64ec6607f74211a5ec1 (diff) | |
| download | usermoji-041fd95ce9ff0ff9cff00a719412172d4801a9f2.tar.xz | |
cmake: GH PR17, Pass WSI arg to layer generating scripts
| -rw-r--r-- | layers/CMakeLists.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 978e9cd9..ce117564 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -1,5 +1,18 @@ cmake_minimum_required (VERSION 2.8.11) +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + if (BUILD_WSI_XCB_SUPPORT) + set(ENV{VULKAN_WSI} "Xcb") + elseif (BUILD_WSI_XLIB_SUPPORT) + set(ENV{VULKAN_WSI} "Xlib") + elseif (BUILD_WSI_WAYLAND_SUPPORT) + set(ENV{VULKAN_WSI} "Wayland") + else() + # Mir WSI Case + set(ENV{VULKAN_WSI} "Mir") + endif() +endif() + 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} @@ -9,7 +22,7 @@ endmacro() macro(run_vk_layer_generate subcmd output) add_custom_command(OUTPUT ${output} - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h > ${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() @@ -62,7 +75,7 @@ endif() if (WIN32) macro(add_vk_layer target) add_custom_command(OUTPUT VkLayer_${target}.def - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py win-def-file VkLayer_${target} layer > 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}/vk.py ) add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def) @@ -113,7 +126,7 @@ if (NOT WIN32) endif() add_custom_command(OUTPUT vk_dispatch_table_helper.h - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py dispatch-table-ops layer > 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) run_vk_helper(gen_enum_string_helper vk_enum_string_helper.h) |