This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d30c1c1e65d3a3cb2599c2b161600f196c059b49 (commit)
via 9970cdcb59e5d02da68c195799146f9bc91816e7 (commit)
from dc1dbedc733126da4ed0fff03cefab71b0692d22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d30c1c1e65d3a3cb2599c2b161600f196c059b49
commit d30c1c1e65d3a3cb2599c2b161600f196c059b49
Merge: dc1dbed 9970cdc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 2 10:42:49 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 2 10:42:49 2016 -0400
Merge topic 'CMakeFindFrameworks-custom-locations' into next
9970cdcb CMakeFindFrameworks: Allow custom framework locations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9970cdcb59e5d02da68c195799146f9bc91816e7
commit 9970cdcb59e5d02da68c195799146f9bc91816e7
Author: David Keller <david.kel...@litchis.fr>
AuthorDate: Sat Jul 30 16:48:53 2016 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Aug 2 10:41:40 2016 -0400
CMakeFindFrameworks: Allow custom framework locations
Read a variable to get non-standard locations to be searched,
e.g. brew, port.
Signed-off-by: David Keller <david.kel...@litchis.fr>
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()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFindFrameworks.cmake | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
