diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-01-23 08:51:08 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-01-23 08:51:08 -0700 |
| commit | 3bdd45e951df7e58d2007f741250c23d241731ab (patch) | |
| tree | 9be58cb4a36464ecbc879dcd2b53e504581e8a85 | |
| parent | ca3399636b1cf82479d37dbd68d0739280313f5f (diff) | |
| download | usermoji-3bdd45e951df7e58d2007f741250c23d241731ab.tar.xz | |
cmake: Move common xml-gen macro to root file
We had several copies of this macro across the repos -- moved it to
the top-level cmake file for sharing.
Change-Id: I33a97ecb24ad8c7cc6826c1a431f668fa2bec41f
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | layers/CMakeLists.txt | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27ab6e50..7a22b4ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,6 +252,14 @@ endif() set (PYTHON_CMD ${PYTHON_EXECUTABLE}) +# Define macros used across all subdirectories +macro(run_vk_xml_generate dependency output) + add_custom_command(OUTPUT ${output} + COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${SCRIPTS_DIR}/vk.xml ${output} + DEPENDS ${SCRIPTS_DIR}/vk.xml ${SCRIPTS_DIR}/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${SCRIPTS_DIR}/reg.py + ) +endmacro() + if(NOT WIN32) include(GNUInstallDirs) diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 295232ec..b035f813 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -26,13 +26,6 @@ else() message(FATAL_ERROR "Unsupported Platform!") endif() -macro(run_vk_xml_generate dependency output) - add_custom_command(OUTPUT ${output} - COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${SCRIPTS_DIR}/vk.xml ${output} - DEPENDS ${SCRIPTS_DIR}/vk.xml ${SCRIPTS_DIR}/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${SCRIPTS_DIR}/reg.py - ) -endmacro() - set(LAYER_JSON_FILES VkLayer_core_validation VkLayer_image |