[Cmake-commits] [cmake-commits] king committed cmVisualStudio10TargetGenerator.cxx 1.26 1.27

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22949/Source

Modified Files:
	cmVisualStudio10TargetGenerator.cxx 
Log Message:
Revert "Always set OutputPath in VS 10 projects"

The reverted commit attempted to preserve the "../" PREFIX work-around
for avoiding per-config build directories in the VS IDE generators.
However, the original reporter has concluded that a "../" PREFIX no
longer works everywhere in VS 10 project files anyway.  Rather than set
OutputPath, this commit restores the $(OutDir)$(TargetName)$(TargetExt)
default.

See issue #9768.


Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** cmVisualStudio10TargetGenerator.cxx	23 Oct 2009 21:02:27 -0000	1.26
--- cmVisualStudio10TargetGenerator.cxx	26 Oct 2009 12:57:01 -0000	1.27
***************
*** 1181,1186 ****
    std::string dir = this->Target->GetDirectory(config.c_str());
    dir += "/";
-   std::string out = dir;
-   out += targetNameFull;
    std::string pdb = dir;
    pdb += targetNamePDB;
--- 1181,1184 ----
***************
*** 1189,1193 ****
    imLib += targetNameImport;
  
-   linkOptions.AddFlag("OutputFile", out.c_str());
    linkOptions.AddFlag("ImportLibrary", imLib.c_str());
    linkOptions.AddFlag("ProgramDataBaseFileName", pdb.c_str());
--- 1187,1190 ----