diff options
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5834d53..35b0aea 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3156,7 +3156,6 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg) msg = e.str(); return false; } -#if 0 /* disable until CTestTargets can be fixed */ else if(!this->NeedBackwardsCompatibility(2, 4)) { // The conflict is with a non-imported target. Produce an error @@ -3165,9 +3164,10 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg) e << "cannot create target \"" << name << "\" because another target with the same name already exists. " << "Logical target names must be globally unique. " - << "Consider using the OUTPUT_NAME target property to create " - << "two targets with the same physical name while keeping logical " - << "names distinct.\n" + << "For executables and libraries, consider using the OUTPUT_NAME " + << "target property to create two targets with the same physical " + << "name while keeping logical names distinct. " + << "Custom targets must simply have globally unique names.\n" << "If you are building an older project it is possible that " << "it violated this rule but was working accidentally. " << "Set CMAKE_BACKWARDS_COMPATIBILITY to 2.4 or lower to disable " @@ -3175,7 +3175,6 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg) msg = e.str(); return false; } -#endif } return true; } |