git.tremily.us Git - gentoo.git/blob

   1 From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001
   2 From: James Le Cuirot <chewi@gentoo.org>
   3 Date: Thu, 15 Mar 2018 22:25:19 +0000
   4 Subject: [PATCH] build: Don't require glslang if not building layers
   5
   6 ---
   7  CMakeLists.txt | 10 ++++++++--
   8  1 file changed, 8 insertions(+), 2 deletions(-)
   9
  10 diff --git a/CMakeLists.txt b/CMakeLists.txt
  11 index 713a9cdfd3..c9f73ce965 100644
  12 --- a/CMakeLists.txt
  13 +++ b/CMakeLists.txt
  14 @@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir symbol_name output)
  15  endmacro()
  16
  17  # Custom target for generated vulkan helper file dependencies
  18 +set(generate_helper_files_DEPENDS)
  19 +if(BUILD_LAYERS)
  20 +    LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h)
  21 +endif()
  22  add_custom_target(generate_helper_files DEPENDS
  23      vk_enum_string_helper.h
  24      vk_safe_struct.h
  25 @@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS
  26      vk_dispatch_table_helper.h
  27      vk_extension_helper.h
  28      vk_typemap_helper.h
  29 -    spirv_tools_commit_id.h
  30 +    ${generate_helper_files_DEPENDS}
  31      )
  32  set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
  33
  34 @@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h)
  35  run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
  36  run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
  37  run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
  38 -run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
  39 +if(BUILD_LAYERS)
  40 +    run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
  41 +endif()
  42
  43
  44
  45