[Cmake-commits] CMake branch, next, updated. v2.8.8-2962-g4856be4

[David Cole]

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  4856be4ffefdebbb397c0dd525a5a77ae4c48c99 (commit)
       via  8b2fb3310b4b8f1d218e479e3f5eafe04e8b8077 (commit)
      from  b5f2553598c535f04e309342d230687d26731e47 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4856be4ffefdebbb397c0dd525a5a77ae4c48c99
commit 4856be4ffefdebbb397c0dd525a5a77ae4c48c99
Merge: b5f2553 8b2fb33
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu May 31 08:25:02 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 31 08:25:02 2012 -0400

    Merge topic 'fix-13261-allow-variable-overrides' into next
    
    8b2fb33 Mac: Add guards to CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE defaults


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b2fb3310b4b8f1d218e479e3f5eafe04e8b8077
commit 8b2fb3310b4b8f1d218e479e3f5eafe04e8b8077
Author:     Charlie Sharpsteen <source at sharpsteen.net>
AuthorDate: Wed May 30 10:29:26 2012 -0700
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu May 31 08:10:17 2012 -0400

    Mac: Add guards to CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE defaults
    
    The default for `CMAKE_FIND_FRAMEWORK`, defined in `Darwin.cmake` and
    `Darwin-icc.cmake`, is now guarded so that it will not override command line
    arguments passed by users.
    
    Similarly for `CMAKE_FIND_APPBUNDLE`

diff --git a/Modules/Platform/Darwin-icc.cmake b/Modules/Platform/Darwin-icc.cmake
index e675c0e..b592e5f 100644
--- a/Modules/Platform/Darwin-icc.cmake
+++ b/Modules/Platform/Darwin-icc.cmake
@@ -106,7 +106,9 @@ SET(CMAKE_Fortran_CREATE_SHARED_MODULE
 
 
 # default to searching for frameworks first
-SET(CMAKE_FIND_FRAMEWORK FIRST)
+IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+  SET(CMAKE_FIND_FRAMEWORK FIRST)
+ENDIF()
 # set up the default search directories for frameworks
 SET(CMAKE_SYSTEM_FRAMEWORK_PATH
   ~/Library/Frameworks
@@ -115,7 +117,9 @@ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
   /System/Library/Frameworks)
 
 # default to searching for application bundles first
-SET(CMAKE_FIND_APPBUNDLE FIRST)
+IF(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+  SET(CMAKE_FIND_APPBUNDLE FIRST)
+ENDIF()
 # set up the default search directories for application bundles
 SET(CMAKE_SYSTEM_APPBUNDLE_PATH
   ~/Applications
@@ -125,4 +129,3 @@ SET(CMAKE_SYSTEM_APPBUNDLE_PATH
 INCLUDE(Platform/UnixPaths)
 SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /sw/include)
 SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} /sw/lib)
-
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index a19bfe7..eff07b2 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -228,9 +228,10 @@ SET(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
       "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
 
 
- 
 # default to searching for frameworks first
-SET(CMAKE_FIND_FRAMEWORK FIRST)
+IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+  SET(CMAKE_FIND_FRAMEWORK FIRST)
+ENDIF()
 # set up the default search directories for frameworks
 SET(CMAKE_SYSTEM_FRAMEWORK_PATH
   ~/Library/Frameworks
@@ -239,7 +240,9 @@ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
   /System/Library/Frameworks)
 
 # default to searching for application bundles first
-SET(CMAKE_FIND_APPBUNDLE FIRST)
+IF(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+  SET(CMAKE_FIND_APPBUNDLE FIRST)
+ENDIF()
 # set up the default search directories for application bundles
 SET(_apps_paths)
 FOREACH(_path

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Darwin-icc.cmake |    9 ++++++---
 Modules/Platform/Darwin.cmake     |    9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake