commit 4ce99e65cf364829bd770885b12f24778ad62f47
author Tobin Ehlis <tobine@google.com> Fri May 11 10:09:41 2018 -0600
committer Tobin Ehlis <tobine@google.com> Fri May 11 12:06:10 2018 -0600
tree 516de511c935d58dbd5aae9a28b6eb2292d553e1
parent 2ae2eee3d4e9b8594923f1735e252f4633985135

icd:Fix Windows build

Make sure we generate vk_typemap_helper.h for mock icd.

icd/CMakeLists.txt

diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
index 44851bf..21e5b8c 100644
--- a/icd/CMakeLists.txt
+++ b/icd/CMakeLists.txt
@@ -106,15 +106,14 @@
     )
     set_target_properties(copy-${target}-def-file PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
     add_library(VkICD_${target} SHARED ${ARGN} VkICD_${target}.def)
-    add_dependencies(VkICD_${target} generate_icd_files)
+    add_dependencies(VkICD_${target} generate_helper_files generate_icd_files)
     #target_link_Libraries(VkICD_${target} VkICD_utils)
-    #add_dependencies(VkICD_${target} generate_helper_files VkICD_utils)
     endmacro()
 elseif(APPLE)
     macro(add_vk_icd target)
     add_library(VkICD_${target} SHARED ${ARGN})
     #target_link_Libraries(VkICD_${target} VkICD_utils)
-    add_dependencies(VkICD_${target} generate_icd_files)
+    add_dependencies(VkICD_${target} generate_helper_files generate_icd_files)
     set_target_properties(VkICD_${target} PROPERTIES LINK_FLAGS "-Wl")
     install(TARGETS VkICD_${target} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
     endmacro()
@@ -122,7 +121,7 @@
     macro(add_vk_icd target)
     add_library(VkICD_${target} SHARED ${ARGN})
     #target_link_Libraries(VkICD_${target} VkICD_utils)
-    add_dependencies(VkICD_${target} generate_icd_files)
+    add_dependencies(VkICD_${target} generate_helper_files generate_icd_files)
     set_target_properties(VkICD_${target} PROPERTIES LINK_FLAGS "-Wl,-export-dynamic,-Bsymbolic,--exclude-libs,ALL")
     if(INSTALL_ICD_FILES)
         install(TARGETS VkICD_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})