diff options
| author | Mark Young <marky@lunarg.com> | 2017-05-09 10:31:12 -0600 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2017-05-09 11:01:03 -0600 |
| commit | 1b9370ca411fc78c1912cd791a0d96b1b294c0d3 (patch) | |
| tree | ff0b9199ad032028f00be5bf2356d63301f8f3cb /layers | |
| parent | 63154a3434160178ef0132a874db6e62a5b9d73f (diff) | |
| download | usermoji-1b9370ca411fc78c1912cd791a0d96b1b294c0d3.tar.xz | |
loader: Code review fixes
Fix some potential issues discovered by Karl in the code review.
Also, fix CMake warning on newly added VkLayer_standard_layer.
The CMake generation code I had been using expected a project with
the same name as the JSON.
Change-Id: I8738ff03ac08bcfc13aa8d11c570a0b507de450a
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 446b3b2b..1253ae6d 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -25,8 +25,7 @@ else() message(FATAL_ERROR "Unsupported Platform!") endif() -set(LAYER_JSON_FILES - VkLayer_standard_validation +set(LAYER_JSON_FILES_WITH_DEPENDENCIES VkLayer_core_validation VkLayer_object_tracker VkLayer_unique_objects @@ -35,6 +34,12 @@ set(LAYER_JSON_FILES VkLayer_threading ) +set(LAYER_JSON_FILES_NO_DEPENDENCIES + VkLayer_standard_validation + ) + +set(LAYER_JSON_FILES ${LAYER_JSON_FILES_WITH_DEPENDENCIES} ${LAYER_JSON_FILES_NO_DEPENDENCIES}) + if (WIN32) if (NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)) if (CMAKE_GENERATOR MATCHES "^Visual Studio.*") @@ -45,7 +50,6 @@ if (WIN32) COMMAND copy ${src_json} ${dst_json} VERBATIM ) - add_dependencies(${config_file}-json ${config_file}) endforeach(config_file) else() foreach (config_file ${LAYER_JSON_FILES}) @@ -55,7 +59,6 @@ if (WIN32) COMMAND copy ${src_json} ${dst_json} VERBATIM ) - add_dependencies(${config_file}-json ${config_file}) endforeach(config_file) endif() endif() @@ -67,10 +70,12 @@ else() COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json VERBATIM ) - add_dependencies(${config_file}-json ${config_file}) endforeach(config_file) endif() endif() +foreach (config_file ${LAYER_JSON_FILES_WITH_DEPENDENCIES}) + add_dependencies(${config_file}-json ${config_file}) +endforeach(config_file) # Add targets for JSON file install on Linux. # Need to remove the "./" from the library path before installing to /etc. |