summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-24 14:12:41 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-24 14:12:41 (GMT)
commit3bda0717b31aa63e906cbc6129674a9e046f1066 (patch)
tree0beb50029b265423ce69ed88ea353e773eb1d0ad
parent133ab7a4476f97c5c524bd1e7dcb65efe7d6f810 (diff)
parent0b54e8366e686340102867035e3dfdedf6f783b9 (diff)
downloadCMake-3bda0717b31aa63e906cbc6129674a9e046f1066.zip
CMake-3bda0717b31aa63e906cbc6129674a9e046f1066.tar.gz
CMake-3bda0717b31aa63e906cbc6129674a9e046f1066.tar.bz2
Merge topic 'vs-midl-absolute-OutputDirectory'
0b54e836 VS: Specify absolute output directory for the Midl tool
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a286049..ca8310c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2522,7 +2522,7 @@ WriteMidlOptions(std::string const& /*config*/,
}
this->WriteString("%(AdditionalIncludeDirectories)"
"</AdditionalIncludeDirectories>\n", 0);
- this->WriteString("<OutputDirectory>$(IntDir)</OutputDirectory>\n", 3);
+ this->WriteString("<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>\n", 3);
this->WriteString("<HeaderFileName>%(Filename).h</HeaderFileName>\n", 3);
this->WriteString(
"<TypeLibraryName>%(Filename).tlb</TypeLibraryName>\n", 3);