Generic default CLOSING_MESSAGE in sample config

[apps/app-templates.git] / cmake / cmake.d / 03-macros.cmake

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 88d6dd4..0bab354 100644 (file)
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -132,19 +132,29 @@ endmacro(add_required_module)
 
 # Create custom target dedicated for HTML5 and DATA AGL target type
 macro(add_input_files INPUT_FILES)
-       set(XML_LIST ${INPUT_FILES})
-       set(LUA_LIST ${INPUT_FILES})
-       set(JSON_LIST ${INPUT_FILES})
+       if(NOT DEFINED XML_FILES)
+               set(ext_reg "xml$")
+               set(XML_LIST ${INPUT_FILES})
+               list_filter(XML_LIST ext_reg)
+       endif()
+       if(NOT DEFINED LUA_LIST)
+               set(ext_reg "lua$")
+               set(LUA_LIST ${INPUT_FILES})
+               list_filter(LUA_LIST ext_reg)
+       endif()
+       if(NOT DEFINED JSON_FILES)
+               set(ext_reg "json$")
+               set(JSON_LIST ${INPUT_FILES})
+               list_filter(JSON_LIST ext_reg)
+       endif()
+
        # These are v3.6 subcommand. Not used as default for now as
        # many dev use Ubuntu 16.04 which have only 3.5 version
        #list(FILTER XML_LIST INCLUDE REGEX "xml$")
        #list(FILTER LUA_LIST INCLUDE REGEX "lua$")
        #list(FILTER JSON_LIST INCLUDE REGEX "json$")
-       list_filter(XML_LIST "xml$")
-       list_filter(LUA_LIST "lua$")
-       list_filter(JSON_LIST "json$")
 
-       add_custom_target(${TARGET_NAME} 
+       add_custom_target(${TARGET_NAME}
        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}
        )
 
@@ -485,7 +495,7 @@ macro(project_closing_msg)
                add_custom_target(${PROJECT_NAME}_build_done ALL
                        COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
                )
-                add_dependencies(${PROJECT_NAME}_build_done
-                       ${DEPENDENCIES_TARGET} ${PROJECT_TARGETS})
+               add_dependencies(${PROJECT_NAME}_build_done
+                       ${PROJECT_TARGETS} populate)
        endif()
 endmacro()