summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons2009-04-17 13:48:11 +0000
committerPeter Simons2009-04-17 13:48:11 +0000
commit2796d3a185433f80210a0edfcceec7a41f27c57f (patch)
treedf44225ade6484b6f41ff0e1892f98ab1fe27c60
parent5bed8bd9e1eab9638a1650409a92d6ccb71e27f1 (diff)
Updated fixCmakeFiles to handle file paths that contain whitespace.
svn path=/nixpkgs/trunk/; revision=15113
-rwxr-xr-xpkgs/development/tools/build-managers/cmake/setup-hook.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index c289272d2a78..fe92e74db0cb 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -11,13 +11,13 @@ fixCmakeFiles()
     echo "fixing cmake files"
     replaceArgs="-e -f -L -T /usr /FOO"
     replaceArgs="$replaceArgs -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\""
-    find $1 -type f -name "*.cmake" | xargs replace-literal ${replaceArgs}
+    find $1 -type f -name "*.cmake" -print0 | xargs -0 replace-literal ${replaceArgs}
 }
 
 cmakeConfigurePhase()
 {
     eval "$preConfigure"
-    
+
     if test -z "$dontFixCmake"; then
         fixCmakeFiles .
     fi
@@ -33,9 +33,9 @@ cmakeConfigurePhase()
     fi
 
     echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
-    
+
     cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
-    
+
     eval "$postConfigure"
 }