[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-645-g1399953
Brad King
brad.king at kitware.com
Mon Feb 23 13:30:53 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 1399953d7ad1b68653a3688c59a283cc107e2506 (commit)
via 0b54e8366e686340102867035e3dfdedf6f783b9 (commit)
from 85851721aab04bb870f8918b50807f138bae7c8e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1399953d7ad1b68653a3688c59a283cc107e2506
commit 1399953d7ad1b68653a3688c59a283cc107e2506
Merge: 8585172 0b54e83
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 13:30:52 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 13:30:52 2015 -0500
Merge topic 'vs-midl-absolute-OutputDirectory' into next
0b54e836 VS: Specify absolute output directory for the Midl tool
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b54e8366e686340102867035e3dfdedf6f783b9
commit 0b54e8366e686340102867035e3dfdedf6f783b9
Author: Tim Blechmann <tim at klingt.org>
AuthorDate: Thu Feb 19 14:35:02 2015 +0800
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 13:22:07 2015 -0500
VS: Specify absolute output directory for the Midl tool
Generate the OutputDirectory element value as an absolute path
to the same location as the existing relative path. Somehow
this addresses an occasional failure in a large/complex build,
and should not hurt basic use cases.
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);
-----------------------------------------------------------------------
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list