mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 21:57:52 +03:00
Updated fixCmakeFiles to handle file paths that contain whitespace.
svn path=/nixpkgs/trunk/; revision=15113
This commit is contained in:
parent
5bed8bd9e1
commit
2796d3a185
@ -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"
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user