aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--icd/CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
index 468cf56a..aa1d44b1 100644
--- a/icd/CMakeLists.txt
+++ b/icd/CMakeLists.txt
@@ -101,11 +101,11 @@ else()
endif()
# Custom target for generated vulkan helper file dependencies
-set(generate_helper_files_DEPENDS)
-add_custom_target(generate_helper_files DEPENDS
+set(icd_generate_helper_files_DEPENDS)
+add_custom_target(icd_generate_helper_files DEPENDS
vk_typemap_helper.h
)
-set_target_properties(generate_helper_files PROPERTIES FOLDER ${TOOLS_TARGET_FOLDER})
+set_target_properties(icd_generate_helper_files PROPERTIES FOLDER ${TOOLS_TARGET_FOLDER})
run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
# For ICD with a direct dependency on a project with the same name, use it.
@@ -129,14 +129,14 @@ if (WIN32)
)
set_target_properties(copy-${target}-def-file PROPERTIES FOLDER ${TOOLS_TARGET_FOLDER})
add_library(VkICD_${target} SHARED ${ARGN} VkICD_${target}.def)
- add_dependencies(VkICD_${target} generate_helper_files generate_icd_files)
+ add_dependencies(VkICD_${target} icd_generate_helper_files generate_icd_files)
#target_link_Libraries(VkICD_${target} 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_helper_files generate_icd_files)
+ add_dependencies(VkICD_${target} icd_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()
@@ -144,7 +144,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_helper_files generate_icd_files)
+ add_dependencies(VkICD_${target} icd_generate_helper_files generate_icd_files)
set_target_properties(VkICD_${target} PROPERTIES LINK_FLAGS "-Wl,-export-dynamic,-Bsymbolic,--exclude-libs,ALL")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
install(TARGETS VkICD_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})