diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-16 16:11:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-16 16:48:04 (GMT) |
| commit | aa2ba12164046cd1812c3f3b67cadca856d51846 (patch) | |
| tree | b6e09b9f2e0391d5865e9b4c3e38ae4a0ebff9c6 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | ec1ec47193fcab7084e8edd977d3bebd1e8c73cb (diff) | |
| download | CMake-aa2ba12164046cd1812c3f3b67cadca856d51846.zip CMake-aa2ba12164046cd1812c3f3b67cadca856d51846.tar.gz CMake-aa2ba12164046cd1812c3f3b67cadca856d51846.tar.bz2 | |
VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
This will allow us to use a value other than just the config name
for the project OutputDirectory setting used for $(OutDir).
Also use $(ConfigurationName) instead of $(OutDir) for the link
directory configuration suffix since that is a hard-coded instance of
a use case for CMAKE_CFG_INTDIR.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 914df5f..88c5284 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1441,7 +1441,8 @@ cmLocalVisualStudio7Generator // First search a configuration-specific subdirectory and then the // original directory. - fout << comma << this->ConvertToXMLOutputPath((dir+"/$(OutDir)").c_str()) + fout << comma + << this->ConvertToXMLOutputPath((dir+"/$(ConfigurationName)").c_str()) << "," << this->ConvertToXMLOutputPath(dir.c_str()); comma = ","; } |