OSDN Git Service

fix checkresources and getresources not taking cpp files into account
authorIvailo Monev <xakepa10@gmail.com>
Sun, 13 Dec 2015 04:27:50 +0000 (06:27 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Sun, 13 Dec 2015 04:27:50 +0000 (06:27 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
scripts/checkresources.sh
scripts/getresources.sh

index 13abf78..0cc654a 100755 (executable)
@@ -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"
index e66e0e9..ad0717b 100755 (executable)
@@ -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