diff options
| author | Tobin Ehlis <tobine@google.com> | 2018-05-11 10:09:41 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2018-05-11 14:39:21 -0600 |
| commit | 10dd4751e5ae9ad7c08dd4ff9d3d8dc2aaf0a276 (patch) | |
| tree | 471d8bf3e05240816828c64b857ccebe40e6f942 | |
| parent | 3e4ef15ea959b2af2ae3ab0424bd937df2fcf743 (diff) | |
| download | usermoji-10dd4751e5ae9ad7c08dd4ff9d3d8dc2aaf0a276.tar.xz | |
icd:Fix Windows build
Make sure we generate vk_typemap_helper.h for mock icd.
| -rw-r--r-- | icd/CMakeLists.txt | 7 |
1 files 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}) |