Fix: use of filter in Cmake 3.5
authorRomain Forlot <romain.forlot@iot.bzh>
Thu, 24 Aug 2017 17:04:22 +0000 (19:04 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Thu, 24 Aug 2017 17:04:22 +0000 (19:04 +0200)
Need using a variable for regex...

Change-Id: Ie5b050a3588dec10d0cc4365aa7272a90f10eb30
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
cmake/cmake.d/03-macros.cmake

index 77b4bd2..45d1ef5 100644 (file)
@@ -133,16 +133,19 @@ endmacro(add_required_module)
 # Create custom target dedicated for HTML5 and DATA AGL target type
 macro(add_input_files INPUT_FILES)
        if(NOT DEFINED XML_FILES)
+               set(ext_reg "xml$")
                set(XML_LIST ${INPUT_FILES})
-               list_filter(XML_LIST "xml$")
+               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 "lua$")
+               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 "json$")
+               list_filter(JSON_LIST ext_reg)
        endif()
 
        # These are v3.6 subcommand. Not used as default for now as