public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated fixCmakeFiles to handle file paths that contain whitespace.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15113
This commit is contained in:
Peter Simons 2009-04-17 13:48:11 +00:00
parent 5bed8bd9e1
commit 2796d3a185
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -11,13 +11,13 @@ fixCmakeFiles()
echo "fixing cmake files" echo "fixing cmake files"
replaceArgs="-e -f -L -T /usr /FOO" replaceArgs="-e -f -L -T /usr /FOO"
replaceArgs="$replaceArgs -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\"" 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() cmakeConfigurePhase()
{ {
eval "$preConfigure" eval "$preConfigure"
if test -z "$dontFixCmake"; then if test -z "$dontFixCmake"; then
fixCmakeFiles . fixCmakeFiles .
fi fi
@ -33,9 +33,9 @@ cmakeConfigurePhase()
fi fi
echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]} cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
eval "$postConfigure" eval "$postConfigure"
} }