alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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

26
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View file

@ -70,15 +70,25 @@ 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
case $flag in if test -n "$isystem_seen" && test -d "$flag"; then
-I*) isystem_seen=
export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}" export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}"
;; else
-L*) isystem_seen=
export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" case $flag in
;; -I*)
esac export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
;;
-L*)
export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
;;
-isystem)
isystem_seen=1
;;
esac
fi
done done
} }