summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-01-21 22:24:54 (GMT)
committerBrad King <brad.king@kitware.com>2009-01-21 22:24:54 (GMT)
commit0d83faf3e371797ca1390842aed30f521e2a20a4 (patch)
treeda3234392b38cd60dcd76fbbeff61e00325fe7ce
parent5b63e31041eb8b0c37c4696f43725a117df80129 (diff)
downloadCMake-0d83faf3e371797ca1390842aed30f521e2a20a4.zip
CMake-0d83faf3e371797ca1390842aed30f521e2a20a4.tar.gz
CMake-0d83faf3e371797ca1390842aed30f521e2a20a4.tar.bz2
BUG: Fix ALL_BUILD ordering enforcement
The previous change to make ALL_BUILD come first among targets did not account for comparing the target name against itself. This led to an invalid ordering of the target set. This change fixes it.
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 02dc39b..e43afc0 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -730,14 +730,14 @@ cmGlobalVisualStudio7Generator::TargetCompare
::operator()(cmTarget const* l, cmTarget const* r)
{
// Make sure ALL_BUILD is first so it is the default active project.
- if(strcmp(l->GetName(), "ALL_BUILD") == 0)
- {
- return true;
- }
if(strcmp(r->GetName(), "ALL_BUILD") == 0)
{
return false;
}
+ if(strcmp(l->GetName(), "ALL_BUILD") == 0)
+ {
+ return true;
+ }
return strcmp(l->GetName(), r->GetName()) < 0;
}