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

cmake: update setup-hook to take -isystem instead of -I into account

Browse Source
This commit is contained in:
Michael Raskin 2016-09-08 09:10:00 +02:00
parent 78178d5854
commit dabf09aa92
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,13 @@ else
fi fi
makeCmakeFindLibs(){ makeCmakeFindLibs(){
isystem_seen=
for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
if test -n "$isystem_seen" && test -d "$flag"; then
isystem_seen=
export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}"
else
isystem_seen=
case $flag in case $flag in
-I*) -I*)
export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}" export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
@ -78,7 +84,11 @@ makeCmakeFindLibs(){
-L*) -L*)
export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
;; ;;
-isystem)
isystem_seen=1
;;
esac esac
fi
done done
} }