diff options
| author | Brad King <brad.king@kitware.com> | 2011-06-15 12:29:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-06-15 12:32:22 (GMT) |
| commit | 3ba1713f6f64624a92b216d8f324d45a7e5635f9 (patch) | |
| tree | 2a4f023be8efbcc80e70dcce2974d07cb2b3cfd1 | |
| parent | a666810643ff2b6197c16e8221a2c031c0c8c94f (diff) | |
| download | CMake-3ba1713f6f64624a92b216d8f324d45a7e5635f9.zip CMake-3ba1713f6f64624a92b216d8f324d45a7e5635f9.tar.gz CMake-3ba1713f6f64624a92b216d8f324d45a7e5635f9.tar.bz2 | |
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@cs.tu-berlin.de>
| -rw-r--r-- | Source/cmFindLibraryCommand.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
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()); |