From 2264ad1c35b5c560e4e788e6f926da52cb58ddb0 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 13 Dec 2015 06:27:50 +0200 Subject: [PATCH] fix checkresources and getresources not taking cpp files into account Signed-off-by: Ivailo Monev --- scripts/checkresources.sh | 3 ++- scripts/getresources.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/checkresources.sh b/scripts/checkresources.sh index 13abf789c..0cc654a40 100755 --- a/scripts/checkresources.sh +++ b/scripts/checkresources.sh @@ -15,7 +15,8 @@ for d in $(find $(pwd) $builddir/include $builddir/privateinclude -type d);do autoinc+=" -I$d" done -allfiles="$(find -iname '*.cpp' -o -iname '*.h' -printf '%P\n')" +allfiles="$(find -iname '*.cpp' -printf '%P\n')" +allfiles+="$(find -iname '*.h' -printf '%P\n')" for i in $allfiles;do if [ -n "$(moc -nw $i $autoinc)" ];then found="no" diff --git a/scripts/getresources.sh b/scripts/getresources.sh index e66e0e919..ad0717b94 100755 --- a/scripts/getresources.sh +++ b/scripts/getresources.sh @@ -8,7 +8,9 @@ for d in $(find $(pwd) $builddir/include $builddir/privateinclude -type d);do autoinc+=" -I$d" done -for i in $(find -iname '*.cpp' -o -iname '*.h' -printf '%P\n');do +allfiles="$(find -iname '*.cpp' -printf '%P\n')" +allfiles+="$(find -iname '*.h' -printf '%P\n')" +for i in $allfiles;do if [ -n "$(moc -nw $i $autoinc)" ];then echo ' ${CMAKE_CURRENT_SOURCE_DIR}/'$i fi