From 3ba1713f6f64624a92b216d8f324d45a7e5635f9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 15 Jun 2011 08:29:00 -0400 Subject: [PATCH] find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- Source/cmFindLibraryCommand.cxx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index 6355a85a7..2fa2ccaa2 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());