Merge lp:~pete-woods/cmake-extras/add-intltool-filter-option into lp:cmake-extras

[Pete Woods]

Add FILTER argument to intltool macros.

Add FILTER argument to intltool macros.

[dobey (dobey)]

Nice.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-09 12:39:48 +0000
+++ debian/changelog	2017-02-09 12:39:48 +0000
@@ -1,6 +1,7 @@
 cmake-extras (1.1-0ubuntu1) UNRELEASED; urgency=medium
 
   * Add IncludeChecker macro.
+  * Add FILTER argument to intltool macros.
 
  -- Pete <[e-mail]>  Wed, 08 Feb 2017 15:02:38 +0000
 
 
=== modified file 'debian/tests/intltool'
--- debian/tests/intltool	2017-01-09 10:35:11 +0000
+++ debian/tests/intltool	2017-02-09 12:39:48 +0000
@@ -38,18 +38,20 @@
   retval=$?
   set -e
 
-  if [ ${retval} -eq 0 ]; then
+  expected=${2:-0}
+
+  if [ ${retval} -eq ${expected} ]; then
     echo "OK"
   else
     echo "FAILED"
+    return 1
   fi
-
-  return ${retval}
 }
 
 check_potfile 'msgid "FooApp"'
 check_potfile 'msgid "FooApp is really great"'
 check_potfile 'msgid "Hello FooApp!"'
+check_potfile 'msgid "this translation should be ignored"' 1
 
 # This binary is a test suite that will exit this outer BASH script if it fails
 G_MESSAGES_DEBUG=all "${installdir}/usr/bin/fooapp"
 
=== modified file 'examples/intltool-demo/po/CMakeLists.txt'
--- examples/intltool-demo/po/CMakeLists.txt	2017-01-09 10:35:11 +0000
+++ examples/intltool-demo/po/CMakeLists.txt	2017-02-09 12:39:48 +0000
@@ -6,6 +6,7 @@
     POTFILES_TEMPLATE "POTFILES.in.in"
     GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
     COPYRIGHT_HOLDER "Foocorp Ltd."
+    FILTER ".*test.*"
 )
 
 intltool_install_translations(
 
=== added directory 'examples/intltool-demo/test'
=== added file 'examples/intltool-demo/test/test.cpp'
--- examples/intltool-demo/test/test.cpp	1970-01-01 00:00:00 +0000
+++ examples/intltool-demo/test/test.cpp	2017-02-09 12:39:48 +0000
@@ -0,0 +1,1 @@
+_("this translation should be ignored")
 
=== modified file 'src/Intltool/IntltoolConfig.cmake'
--- src/Intltool/IntltoolConfig.cmake	2016-12-02 05:58:34 +0000
+++ src/Intltool/IntltoolConfig.cmake	2017-02-09 12:39:48 +0000
@@ -155,10 +155,32 @@
     set(${OUTPUT} "${_TMP}" PARENT_SCOPE)
 endfunction()
 
+function(_INTLTOOL_LIST_FILTER INPUT OUTPUT)
+    set(_multiValueArgs EXPRESSIONS)
+    cmake_parse_arguments(_ARG "" "" "${_multiValueArgs}" ${ARGN})
+
+    if(_ARG_EXPRESSIONS)
+        set(_TMP "")
+        foreach(_ITEM ${${INPUT}})
+            foreach(_REGEX ${_ARG_EXPRESSIONS})
+                if("${_ITEM}" MATCHES "${_REGEX}")
+                else()
+                    list(APPEND _TMP "${_ITEM}")
+                endif()
+            endforeach()
+        endforeach()
+        set(${OUTPUT} "${_TMP}" PARENT_SCOPE)
+        unset(_TMP)
+    else()
+        set(${OUTPUT} "${${INPUT}}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+
 function(INTLTOOL_UPDATE_POTFILE)
     set(_options ALL UBUNTU_SDK_DEFAULTS)
     set(_oneValueArgs COPYRIGHT_HOLDER GETTEXT_PACKAGE OUTPUT_FILE PO_DIRECTORY POTFILES_TEMPLATE)
-    set(_multiValueArgs KEYWORDS FILE_GLOBS)
+    set(_multiValueArgs KEYWORDS FILE_GLOBS FILTER)
 
     cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
     
@@ -213,7 +235,10 @@
     )
 
     # We don't want to include paths from the binary directory
-    _intltool_exclude_path(_SOURCE_FILES ${CMAKE_BINARY_DIR} _FILTERED_SOURCE_FILES)
+    _intltool_exclude_path(_SOURCE_FILES ${CMAKE_BINARY_DIR} _FILTERED_SOURCE_FILES_TMP)
+
+    # Remove any paths from the filter expressions
+    _intltool_list_filter(_FILTERED_SOURCE_FILES_TMP _FILTERED_SOURCE_FILES EXPRESSIONS ${_ARG_FILTER})
 
     # Build the text to substitute into the POTFILES.in
     _intltool_join_list(_FILTERED_SOURCE_FILES "\n" GENERATED_POTFILES)