[Cmake-commits] [cmake-commits] king committed cmLocalVisualStudio6Generator.cxx 1.155 1.156 cmLocalVisualStudio7Generator.cxx 1.243 1.244
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jul 3 10:33:51 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv23011/Source
Modified Files:
cmLocalVisualStudio6Generator.cxx
cmLocalVisualStudio7Generator.cxx
Log Message:
BUG: Avoid cmTarget::GetDirectory for utilities
Since utility targets have no main output files like executables or
libraries, they do not define an output directory. This removes a call
to cmTarget::GetDirectory from cmLocalVisualStudio{6,7}Generator for
such targets.
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.243
retrieving revision 1.244
diff -C 2 -d -r1.243 -r1.244
*** cmLocalVisualStudio7Generator.cxx 3 Jul 2009 14:33:34 -0000 1.243
--- cmLocalVisualStudio7Generator.cxx 3 Jul 2009 14:33:45 -0000 1.244
***************
*** 865,869 ****
// Check if we need the FAT32 workaround.
! if ( this->Version >= 8 )
{
// Check the filesystem type where the target will be written.
--- 865,869 ----
// Check if we need the FAT32 workaround.
! if(targetBuilds && this->Version >= 8)
{
// Check the filesystem type where the target will be written.
Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.155
retrieving revision 1.156
diff -C 2 -d -r1.155 -r1.156
*** cmLocalVisualStudio6Generator.cxx 3 Jul 2009 14:33:34 -0000 1.155
--- cmLocalVisualStudio6Generator.cxx 3 Jul 2009 14:33:45 -0000 1.156
***************
*** 883,889 ****
std::vector<cmSourceGroup> &)
{
- // Lookup the output directory for the target.
- std::string outPath = target.GetDirectory();
-
bool targetBuilds = (target.GetType() >= cmTarget::EXECUTABLE &&
target.GetType() <= cmTarget::MODULE_LIBRARY);
--- 883,886 ----
***************
*** 1416,1423 ****
(exePath.c_str())).c_str());
#endif
! cmSystemTools::ReplaceString
! (line, "OUTPUT_DIRECTORY",
! removeQuotes(this->ConvertToOptionallyRelativeOutputPath
! (outPath.c_str())).c_str());
cmSystemTools::ReplaceString(line,
--- 1413,1425 ----
(exePath.c_str())).c_str());
#endif
!
! if(targetBuilds)
! {
! std::string outPath = target.GetDirectory();
! cmSystemTools::ReplaceString
! (line, "OUTPUT_DIRECTORY",
! removeQuotes(this->ConvertToOptionallyRelativeOutputPath
! (outPath.c_str())).c_str());
! }
cmSystemTools::ReplaceString(line,
More information about the Cmake-commits
mailing list