From 10dd4751e5ae9ad7c08dd4ff9d3d8dc2aaf0a276 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Fri, 11 May 2018 10:09:41 -0600 Subject: icd:Fix Windows build Make sure we generate vk_typemap_helper.h for mock icd. --- icd/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt index 44851bf7..21e5b8ce 100644 --- a/icd/CMakeLists.txt +++ b/icd/CMakeLists.txt @@ -106,15 +106,14 @@ if (WIN32) ) 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 @@ else() 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}) -- cgit v1.2.3