[Cmake-commits] CMake branch, next, updated. v2.8.4-1762-g0cd72af

[Brad King]

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  0cd72affbc1094dbfd4705ec10bec502b3ec6f1f (commit)
       via  3ba1713f6f64624a92b216d8f324d45a7e5635f9 (commit)
      from  4715c8dcecf59853b16eb7e271ec016537c2811a (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=0cd72affbc1094dbfd4705ec10bec502b3ec6f1f
commit 0cd72affbc1094dbfd4705ec10bec502b3ec6f1f
Merge: 4715c8d 3ba1713
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 15 09:00:24 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 15 09:00:24 2011 -0400

    Merge topic 'find_library-lib64-issue-12247+12248' into next
    
    3ba1713 find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ba1713f6f64624a92b216d8f324d45a7e5635f9
commit 3ba1713f6f64624a92b216d8f324d45a7e5635f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 15 08:29:00 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 15 08:32:22 2011 -0400

    find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
    
    Do not require the C language to be enabled to do lib->lib64 conversion.
    The check was originally added by commit a5825cd1 (check in new find
    stuff, 2006-03-02) to ensure that CMAKE_SIZEOF_VOID_P is set.  Since
    commit 3fdf1411 (FIND_LIBRARY should not require CMAKE_SIZEOF_VOID_P,
    2008-02-11) the code following the check does not fail when the variable
    is not set, so just remove the original check.  This allows conversion
    for any language that is enabled so long as the address size is known.
    
    Reported-by: Christoph Höger <choeger at cs.tu-berlin.de>

diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 6355a85..2fa2cca 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -164,11 +164,6 @@ void cmFindLibraryCommand::AddArchitecturePaths(const char* suffix)
 
 void cmFindLibraryCommand::AddLib64Paths()
 {  
-  if(!this->Makefile->GetLocalGenerator()->GetGlobalGenerator()->
-     GetLanguageEnabled("C"))
-    {
-    return;
-    }
   std::string voidsize =
     this->Makefile->GetSafeDefinition("CMAKE_SIZEOF_VOID_P");
   int size = atoi(voidsize.c_str());

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

Summary of changes:
 Source/cmFindLibraryCommand.cxx |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake