[Cmake-commits] CMake branch, next, updated. v2.8.5-1671-g7ada2d7

[Alexander Neundorf]

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  7ada2d7c9493ffe2109558ab6c2aceb5d7776fe0 (commit)
       via  59238dc2deb80f3f3d101de9a3945f890981a2c0 (commit)
      from  6ed1896f606a5048c334e6a50297b6054f66d56e (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=7ada2d7c9493ffe2109558ab6c2aceb5d7776fe0
commit 7ada2d7c9493ffe2109558ab6c2aceb5d7776fe0
Merge: 6ed1896 59238dc
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 22 15:49:55 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 22 15:49:55 2011 -0400

    Merge topic 'UsingCMakeLikePkgConfig2' into next
    
    59238dc Fix --find-package mode on Cygwin, where enable_language(RC) is called


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59238dc2deb80f3f3d101de9a3945f890981a2c0
commit 59238dc2deb80f3f3d101de9a3945f890981a2c0
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 22 21:53:22 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Aug 22 21:53:22 2011 +0200

    Fix --find-package mode on Cygwin, where enable_language(RC) is called
    
    In --find-package mode we can't enable a language, since a lot of
    stuff has not been set up, e.g. which make tool to use.
    So disable enable_language() in this mode.
    
    Alex

diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index e0b5885..4296577 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -41,6 +41,12 @@ endif()
 # it doesn't know whether it should set WIN32 or not:
 cmake_minimum_required(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} )
 
+macro(ENABLE_LANGUAGE)
+  # disable the enable_language() command, otherwise --find-package breaks on Windows.
+  # On Windows, enable_language(RC) is called in the platform files unconditionally.
+  # But in --find-package mode, we don't want (and can't) enable any language.
+endmacro()
+
 include(CMakeDetermineSystem)
 
 # short-cut some tests on Darwin, see Darwin-GNU.cmake:

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

Summary of changes:
 Modules/CMakeFindPackageMode.cmake |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake