aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Young <marky@lunarg.com>2017-05-10 09:51:18 -0600
committerMark Young <marky@lunarg.com>2017-05-10 09:51:18 -0600
commit976fec72e794a73e547ffd3f995582f5e556481e (patch)
tree75291e20ebaeb598472c571453718034a90550c6
parent796c0f9a408506fb9460ac025205e208aac2165c (diff)
downloadusermoji-976fec72e794a73e547ffd3f995582f5e556481e.tar.xz
layers: Fix build dependency
The no-dependency layer's still need to have a dependency in order for the commands to execute in the proper order. So, just tied them to the utils object. Change-Id: Ic279dcf86b8f0e551b194a6b5688ea646b00cc5f
-rw-r--r--layers/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 1253ae6d..d26d3997 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -73,9 +73,17 @@ else()
endforeach(config_file)
endif()
endif()
+# If a layer has a direcgt dependency on a project with the same name, use it.
foreach (config_file ${LAYER_JSON_FILES_WITH_DEPENDENCIES})
add_dependencies(${config_file}-json ${config_file})
endforeach(config_file)
+# If a layer has no direct dependencies, give it one so it copies in the proper order
+foreach (config_file ${LAYER_JSON_FILES_NO_DEPENDENCIES})
+ add_dependencies(${config_file}-json VkLayer_utils)
+endforeach(config_file)
+
+
+
# Add targets for JSON file install on Linux.
# Need to remove the "./" from the library path before installing to /etc.