Merge lp:~larryprice/cmake-extras/fix-filtering into lp:cmake-extras

[Larry Price]

Intltool filtering should filter out files that match any regex.

Intltool filtering should filter out files that match any regex. The current behavior is that any file that *does not match* one regex from the given expressions will be allowed into the filtered list.

[Pete Woods (pete-woods)]

As per the other review. Your fix looks good, but please add a regression test for it.

[Pete Woods (pete-woods)]

review: Needs Fixing

[lp:~larryprice/cmake-extras/fix-filtering]

74. By Larry Price on 2017-03-27

Add an additional filter item (breaks old test, fixed by this MP)

[Larry Price (larryprice)]

Thanks for giving it a once-over. I changed the FILTER in the test to a list, which broke the original filter test. By adding in this MP, the filter test is fixed. Let me know if you would prefer an individual new test as well.

[Pete Woods (pete-woods)]

No, that's totally fine. Thanks for the red-green explanation :)

review: Approve

[Pete Woods (pete-woods)]

Sadly your branches trivially conflict with each other.

Unmerged revisions

=== modified file 'examples/intltool-demo/po/CMakeLists.txt'
--- examples/intltool-demo/po/CMakeLists.txt	2017-02-22 19:59:32 +0000
+++ examples/intltool-demo/po/CMakeLists.txt	2017-03-27 20:47:33 +0000
@@ -5,7 +5,7 @@
     GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
     COPYRIGHT_HOLDER "Foocorp Ltd."
     FILE_GLOBS "${CMAKE_SOURCE_DIR}/*.gschema.xml.in"
-    FILTER ".*test.*"
+    FILTER ".*test.*;.*filtered"
 )
 
 intltool_install_translations(

=== modified file 'src/Intltool/IntltoolConfig.cmake'
--- src/Intltool/IntltoolConfig.cmake	2017-02-28 17:46:57 +0000
+++ src/Intltool/IntltoolConfig.cmake	2017-03-27 20:47:33 +0000
@@ -173,12 +173,16 @@
     if(_ARG_EXPRESSIONS)
         set(_TMP "")
         foreach(_ITEM ${${INPUT}})
+            unset(_MATCHED)
             foreach(_REGEX ${_ARG_EXPRESSIONS})
                 if("${_ITEM}" MATCHES "${_REGEX}")
-                else()
-                    list(APPEND _TMP "${_ITEM}")
+                  set(_MATCHED ON)
+                  break()
                 endif()
             endforeach()
+            if(NOT _MATCHED)
+              list(APPEND _TMP "${_ITEM}")
+            endif()
         endforeach()
         set(${OUTPUT} "${_TMP}" PARENT_SCOPE)
         unset(_TMP)