summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-04-05 21:06:00 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-04-05 21:06:00 (GMT)
commit3ca108141990ff8372f9b4842e9a29a72bb817c2 (patch)
tree20fb82295df7dc343297780615130a39429d983c /Source/cmMakefile.cxx
parent96e2956ec80dc302edd2a94b4114ab0fec273cbf (diff)
downloadCMake-3ca108141990ff8372f9b4842e9a29a72bb817c2.zip
CMake-3ca108141990ff8372f9b4842e9a29a72bb817c2.tar.gz
CMake-3ca108141990ff8372f9b4842e9a29a72bb817c2.tar.bz2
BUG: try to address Bug 1673 .
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx18
1 files changed, 17 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 34d44e2..baf3b0b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2184,7 +2184,23 @@ std::string cmMakefile::FindLibrary(const char* name,
}
}
}
-
+ if(m_LocalGenerator->GetGlobalGenerator()->GetLanguageEnabled("C"))
+ {
+ std::string voidsize = this->GetRequiredDefinition("CMAKE_SIZEOF_VOID_P");
+ int size = atoi(voidsize.c_str());
+ if(size == 8)
+ {
+ path.push_back("/usr/X11R6/lib64");
+ path.push_back("/usr/local/lib64");
+ path.push_back("/usr/lib64");
+ }
+ if(size == 4)
+ {
+ path.push_back("/usr/X11R6/lib32");
+ path.push_back("/usr/local/lib32");
+ path.push_back("/usr/lib32");
+ }
+ }
return cmSystemTools::FindLibrary(name, path);
}