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

BUG: add back thread library

Browse Source
This commit is contained in:
Bill Hoffman 2001-05-11 11:39:31 -04:00
parent dbfc72c6b5
commit f81ae29834
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeVariables.make.in
View File

@ -73,7 +73,6 @@ THREAD_LIBS = @CMAKE_THREAD_LIBS@
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files. # when installing files.
INSTALL_ROOT = INSTALL_ROOT =
INSTALL = @CMAKE_INSTALL@
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin

17
Source/cmFindLibraryCommand.cxx
View File

@ -52,7 +52,22 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
// Now check and see if the value has been stored in the cache // Now check and see if the value has been stored in the cache
// already, if so use that value and don't look for the program // already, if so use that value and don't look for the program
std::string helpString = "Where can the "; std::string helpString = "Where can the ";
helpString += args[1] + " library be found"; if(args[1] == "NAMES")
{
int i = 2;
while(args[i] != "PATHS" && i < args.size())
{
helpString = "( ";
helpString += args[i];
helpString += " ";
i++;
}
}
else
{
helpString += args[1];
}
helpString += " library be found";
const char* cacheValue const char* cacheValue
= cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str()); = cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str());
if(cacheValue && strcmp(cacheValue, "NOTFOUND")) if(cacheValue && strcmp(cacheValue, "NOTFOUND"))