From 5e0b34eeca9b15d96313eb36b70796d252d4e992 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 24 Aug 2017 19:04:22 +0200 Subject: [PATCH] Fix: use of filter in Cmake 3.5 Need using a variable for regex... Change-Id: Ie5b050a3588dec10d0cc4365aa7272a90f10eb30 Signed-off-by: Romain Forlot --- cmake/cmake.d/03-macros.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index 77b4bd2..45d1ef5 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -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 -- 2.16.6