diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-10-22 09:15:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 09:15:19 +0200 |
| commit | d7a921cad9d646844c4b21977131ccb0ecf34e6f (patch) | |
| tree | 159e098f5828d0fcb3dfa318858c8f9073395328 /pkgs/development/tools/build-managers | |
| parent | 3ca78c1a12a89c5e59fd39589a1092625a2e8e5a (diff) | |
| parent | b6ba25ce95e5a26839a1be58a8f26c19d5231192 (diff) | |
| download | nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.gz nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.bz2 nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.lz nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.xz nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.tar.zst nixlib-d7a921cad9d646844c4b21977131ccb0ecf34e6f.zip | |
Merge pull request #71221 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 29fe6fd79de4..b8716c5251eb 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -124,12 +124,17 @@ addEnvHooks "$targetOffset" addCMakeParams makeCmakeFindLibs(){ isystem_seen= + iframework_seen= 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}" + elif test -n "$iframework_seen" && test -d "$flag"; then + iframework_seen= + export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag}" else isystem_seen= + iframework_seen= case $flag in -I*) export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}" @@ -143,6 +148,9 @@ makeCmakeFindLibs(){ -isystem) isystem_seen=1 ;; + -iframework) + iframework_seen=1 + ;; esac fi done |