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

Do not collapse path of NOTFOUND values 

In cmMakefile::AddCacheDefinition we collapse paths specified in PATH or
FILEPATH cache entries originally specified on the command line with
UNINITALIZED type.  This commit fixes the logic to avoid collapsing
<var>-NOTFOUND and other false values.  The change allows other CMake
code to force a NOTFOUND value on an entry with UNINITALIZED type.
This commit is contained in:
Brad King 2009-10-07 14:37:19 -04:00
parent fff1c6d275
commit 1b5a986a42
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefile.cxx
View File

@ -1719,7 +1719,10 @@ void cmMakefile::AddCacheDefinition(const char* name, const char* value,
cmSystemTools::ExpandListArgument(val, files);
for ( cc = 0; cc < files.size(); cc ++ )
{
files[cc] = cmSystemTools::CollapseFullPath(files[cc].c_str());
if(!cmSystemTools::IsOff(files[cc].c_str()))
{
files[cc] = cmSystemTools::CollapseFullPath(files[cc].c_str());
}
if ( cc > 0 )
{
nvalue += ";";