diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-07-03 15:50:39 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-07-04 14:52:30 -0600 |
| commit | b697edca01c0d23947b5a1eca68596804ae4b1ac (patch) | |
| tree | 86ac20e03b5a95ea266fc0afabd6f45f18af46d3 | |
| parent | bb572db9778ddc02162043e397de4c587ea93b85 (diff) | |
| download | usermoji-b697edca01c0d23947b5a1eca68596804ae4b1ac.tar.xz | |
layers: GH1922, Fix out-of-tree builds
Change-Id: I82bd4d1285a7ec69c7b8209937235f538375773a
| -rw-r--r-- | layers/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | scripts/parameter_validation_generator.py | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 35a1b41d..b5914225 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -60,6 +60,13 @@ if (WIN32) ) endforeach(config_file) endif() + # Copy vk_validation_error_messages.h from source to build dir for scripts to pick up + FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/vk_validation_error_messages.h src_val_msgs) + FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/vk_validation_error_messages.h dst_val_msgs) + add_custom_target(vk_validation_error_messages ALL + COMMAND copy ${src_val_msgs} ${dst_val_msgs} + VERBATIM + ) endif() else() # extra setup for out-of-tree builds @@ -70,6 +77,11 @@ else() VERBATIM ) endforeach(config_file) + # Add link to vk_validation_error_messages.h in build dir for scripts to pick up + add_custom_target(vk_validation_error_messages ALL + COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/vk_validation_error_messages.h + VERBATIM + ) endif() endif() # If a layer has a direcgt dependency on a project with the same name, use it. @@ -178,7 +190,7 @@ add_vk_layer(object_tracker object_tracker.cpp vk_layer_table.cpp) # generated add_vk_layer(threading threading.cpp thread_check.h vk_layer_table.cpp) add_vk_layer(unique_objects unique_objects.cpp unique_objects_wrappers.h vk_layer_table.cpp) -add_vk_layer(parameter_validation parameter_validation.cpp parameter_validation.h vk_layer_table.cpp) +add_vk_layer(parameter_validation parameter_validation.cpp parameter_validation.h vk_layer_table.cpp vk_validation_error_messages.h) # Core validation has additional dependencies target_include_directories(VkLayer_core_validation PRIVATE ${GLSLANG_SPIRV_INCLUDE_DIR}) diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 38b0d882..49a002ce 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -173,6 +173,7 @@ class ParamCheckerOutputGenerator(OutputGenerator): self.vuid_file = None # Cover cases where file is built from scripts directory, Lin/Win, or Android build structure vuid_filename_locations = [ + './vk_validation_error_messages.h', '../layers/vk_validation_error_messages.h', '../../layers/vk_validation_error_messages.h', '../../../layers/vk_validation_error_messages.h', |