summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-03-04 04:00:09 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-03-04 04:00:09 (GMT)
commit4cdfc76c491b3003626048e9dc683b4e0a77ab25 (patch)
tree4181fbcde79ccf53bf7240d69fc8c1fd84914028
parent06846c4c07294ed460b0ebb2c775b385e2e6d9c9 (diff)
downloadCMake-4cdfc76c491b3003626048e9dc683b4e0a77ab25.zip
CMake-4cdfc76c491b3003626048e9dc683b4e0a77ab25.tar.gz
CMake-4cdfc76c491b3003626048e9dc683b4e0a77ab25.tar.bz2
ENH: make sure NAMES tag is not required for name argument, fixes msys generator
-rw-r--r--Source/cmFindBase.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index f12c8db..d1d70bf 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -35,10 +35,10 @@ cmFindBase::cmFindBase()
" FIND_XXX(<VAR> name1 path1 path2 ...)\n"
"This is the short-hand signature for the command that "
"is sufficient in many cases. It is the same "
- "as FIND_XXX(<VAR> NAMES name1 PATHS path2 path2 ...)\n"
+ "as FIND_XXX(<VAR> name1 PATHS path2 path2 ...)\n"
" FIND_XXX(\n"
" <VAR> \n"
- " NAMES name1 [name2 ...]\n"
+ " name | NAMES name1 [name2 ...]\n"
" PATHS path1 [path2 ...]\n"
" [PATH_SUFFIXES suffix1 [suffix2 ...]]\n"
" [DOC \"cache documentation string\"]\n"
@@ -134,11 +134,11 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
this->AlreadyInCache = false;
std::vector<std::string> userPaths;
std::string doc;
- bool doingNames = false;
+ bool doingNames = true; // assume it starts with a name
bool doingPaths = false;
bool doingPathSuf = false;
bool newStyle = false;
-
+
for (unsigned int j = 1; j < args.size(); ++j)
{
if(args[j] == "NAMES")