alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #70997 from veprbl/pr/cmake_iframework

Browse source 
cmake: process -iframework in setup-hook
This commit is contained in:
Dmitry Kalinkin 2019-10-13 07:33:35 -04:00 committed by GitHub
parent 697429c98a c8041d97a5
commit 5d19c11efe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 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

@ -124,12 +124,17 @@ addEnvHooks "$targetOffset" addCMakeParams
makeCmakeFindLibs(){ makeCmakeFindLibs(){
isystem_seen= isystem_seen=
iframework_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 if test -n "$isystem_seen" && test -d "$flag"; then
isystem_seen= isystem_seen=
export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}" export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}"
elif test -n "$iframework_seen" && test -d "$flag"; then
iframework_seen=
export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag}"
else else
isystem_seen= isystem_seen=
iframework_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}"
@ -143,6 +148,9 @@ makeCmakeFindLibs(){
-isystem) -isystem)
isystem_seen=1 isystem_seen=1
;; ;;
-iframework)
iframework_seen=1
;;
esac esac
fi fi
done done