X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=45d1ef50b41d3cd058f8eae09e34dd63e2b307d5;hb=5e0b34eeca9b15d96313eb36b70796d252d4e992;hp=88d6dd4929ce98db80a86fc7bb9813647db839a6;hpb=de031182cb49d2d0a84a09cc12c50cc6d05a37dd;p=staging%2Fxdg-launcher.git

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 88d6dd4..45d1ef5 100644
--- 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}
 	)