diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-03 13:20:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-03 13:20:56 (GMT) |
| commit | c2bc47f2662ec7e80469bee634c2444ee3d28bcc (patch) | |
| tree | 8ba1082cd723afef9d0f348809b5a7707327c751 | |
| parent | aabf8772fd3a2dde07d48d41658db728755e3041 (diff) | |
| parent | 9970cdcb59e5d02da68c195799146f9bc91816e7 (diff) | |
| download | CMake-c2bc47f2662ec7e80469bee634c2444ee3d28bcc.zip CMake-c2bc47f2662ec7e80469bee634c2444ee3d28bcc.tar.gz CMake-c2bc47f2662ec7e80469bee634c2444ee3d28bcc.tar.bz2 | |
Merge topic 'CMakeFindFrameworks-custom-locations'
9970cdcb CMakeFindFrameworks: Allow custom framework locations
| -rw-r--r-- | Modules/CMakeFindFrameworks.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/CMakeFindFrameworks.cmake b/Modules/CMakeFindFrameworks.cmake index 6a8bcd4..80eb003 100644 --- a/Modules/CMakeFindFrameworks.cmake +++ b/Modules/CMakeFindFrameworks.cmake @@ -3,6 +3,10 @@ # ------------------- # # helper module to find OSX frameworks +# +# This module reads hints about search locations from variables:: +# +# CMAKE_FIND_FRAMEWORK_EXTRA_LOCATIONS - Extra directories #============================================================================= # Copyright 2003-2009 Kitware, Inc. @@ -24,9 +28,11 @@ if(NOT CMAKE_FIND_FRAMEWORKS_INCLUDED) if(APPLE) foreach(dir ~/Library/Frameworks/${fwk}.framework + /usr/local/Frameworks/${fwk}.framework /Library/Frameworks/${fwk}.framework /System/Library/Frameworks/${fwk}.framework - /Network/Library/Frameworks/${fwk}.framework) + /Network/Library/Frameworks/${fwk}.framework + ${CMAKE_FIND_FRAMEWORK_EXTRA_LOCATIONS}) if(EXISTS ${dir}) set(${fwk}_FRAMEWORKS ${${fwk}_FRAMEWORKS} ${dir}) endif() |