kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: try to address Bug 1673 .

This commit is contained in:
Bill Hoffman 2005-04-05 17:06:00 -04:00
parent 96e2956ec8
commit 3ca1081419
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeTestCCompiler.cmake
View File

@ -32,5 +32,7 @@ ELSE(NOT CMAKE_C_COMPILER_WORKS)
"Determining if the C compiler works passed with " "Determining if the C compiler works passed with "
"the following output:\n${OUTPUT}\n\n") "the following output:\n${OUTPUT}\n\n")
ENDIF(C_TEST_WAS_RUN) ENDIF(C_TEST_WAS_RUN)
INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
CHECK_TYPE_SIZE("void *" CMAKE_SIZEOF_VOID_P)
SET(CMAKE_C_COMPILER_WORKS 1 CACHE INTERNAL "") SET(CMAKE_C_COMPILER_WORKS 1 CACHE INTERNAL "")
ENDIF(NOT CMAKE_C_COMPILER_WORKS) ENDIF(NOT CMAKE_C_COMPILER_WORKS)

18
Source/cmMakefile.cxx
View File

@ -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); return cmSystemTools::FindLibrary(name, path);
} }