From: Joonbum Ko <joonbum.ko@samsung.com>
Date: Mon, 22 Oct 2018 01:00:34 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/upstream' into tizen
X-Git-Tag: accepted/tizen/5.0/unified/20181109.062746~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd1d9dc6900302d57db976c5536eb3a297dd571b;p=platform%2Fupstream%2FVulkan-LoaderAndValidationLayers.git

Merge remote-tracking branch 'origin/upstream' into tizen

Change-Id: I919d155e3bc4ba5e97d11ec9bb8732e0058b0d69
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>
---

fd1d9dc6900302d57db976c5536eb3a297dd571b
diff --cc CMakeLists.txt
index 3a8a245,77d1d34..0e99e74
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -358,9 -380,12 +381,11 @@@ run_vk_xml_generate(helper_file_generat
  run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
  run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
  run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+ if(BUILD_LAYERS)
+     run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+ endif()
  
  
 -
  if(NOT WIN32)
      include(GNUInstallDirs)