summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-03-16 23:24:26 (GMT)
committerBrad King <brad.king@kitware.com>2006-03-16 23:24:26 (GMT)
commit94cc5898e71cf9b31c8d3b4ec26c82d1e85895a8 (patch)
tree0a4c876ace15528c985cc0913ff5fbbf55101c69 /Source
parent0fa30e1a69296ff46e2601c0508bb0cc3a7c9ff8 (diff)
downloadCMake-94cc5898e71cf9b31c8d3b4ec26c82d1e85895a8.zip
CMake-94cc5898e71cf9b31c8d3b4ec26c82d1e85895a8.tar.gz
CMake-94cc5898e71cf9b31c8d3b4ec26c82d1e85895a8.tar.bz2
BUG: When generating the install rules for CMake itself the per-configuration subdirectory must be used to specify the executable location.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalGenerator.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3ceeb2e..289bf90 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1324,6 +1324,11 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
// We are building CMake itself. We cannot use the original
// executable to install over itself.
cmd = mf->GetDefinition("EXECUTABLE_OUTPUT_PATH");
+ if(cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.')
+ {
+ cmd += "/";
+ cmd += cmakeCfgIntDir;
+ }
cmd += "/cmake";
}
else