[Cmake-commits] [cmake-commits] hoffman committed cmInstallFilesCommand.cxx 1.29.2.1 1.29.2.2 cmInstallProgramsCommand.cxx 1.22.2.1 1.22.2.2 cmLinkDirectoriesCommand.h 1.13 1.13.2.1 cmLocalGenerator.cxx 1.269.2.9 1.269.2.10
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Feb 4 17:04:51 EST 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv23405/Source
Modified Files:
Tag: CMake-2-6
cmInstallFilesCommand.cxx cmInstallProgramsCommand.cxx
cmLinkDirectoriesCommand.h cmLocalGenerator.cxx
Log Message:
ENH: merge in a few more changes for RC 11
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.269.2.9
retrieving revision 1.269.2.10
diff -C 2 -d -r1.269.2.9 -r1.269.2.10
*** cmLocalGenerator.cxx 13 Jan 2009 18:03:52 -0000 1.269.2.9
--- cmLocalGenerator.cxx 4 Feb 2009 22:04:49 -0000 1.269.2.10
***************
*** 2361,2364 ****
--- 2361,2368 ----
std::string destination = l->second.GetInstallPath().substr(1);
cmSystemTools::ConvertToUnixSlashes(destination);
+ if(destination.empty())
+ {
+ destination = ".";
+ }
// Generate the proper install generator for this target type.
Index: cmLinkDirectoriesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLinkDirectoriesCommand.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C 2 -d -r1.13 -r1.13.2.1
*** cmLinkDirectoriesCommand.h 23 Jan 2008 15:27:59 -0000 1.13
--- cmLinkDirectoriesCommand.h 4 Feb 2009 22:04:49 -0000 1.13.2.1
***************
*** 67,71 ****
" link_directories(directory1 directory2 ...)\n"
"Specify the paths in which the linker should search for libraries. "
! "The command will apply only to targets created after it is called.";
}
--- 67,76 ----
" link_directories(directory1 directory2 ...)\n"
"Specify the paths in which the linker should search for libraries. "
! "The command will apply only to targets created after it is called. "
! "For historical reasons, relative paths given to this command are "
! "passed to the linker unchanged "
! "(unlike many CMake commands which interpret them relative to the "
! "current source directory)."
! ;
}
Index: cmInstallProgramsCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallProgramsCommand.cxx,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C 2 -d -r1.22.2.1 -r1.22.2.2
*** cmInstallProgramsCommand.cxx 13 Jul 2008 21:55:24 -0000 1.22.2.1
--- cmInstallProgramsCommand.cxx 4 Feb 2009 22:04:49 -0000 1.22.2.2
***************
*** 87,90 ****
--- 87,94 ----
std::string destination = this->Destination.substr(1);
cmSystemTools::ConvertToUnixSlashes(destination);
+ if(destination.empty())
+ {
+ destination = ".";
+ }
// Use a file install generator.
Index: cmInstallFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.cxx,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -C 2 -d -r1.29.2.1 -r1.29.2.2
*** cmInstallFilesCommand.cxx 13 Jul 2008 21:55:24 -0000 1.29.2.1
--- cmInstallFilesCommand.cxx 4 Feb 2009 22:04:49 -0000 1.29.2.2
***************
*** 126,129 ****
--- 126,133 ----
std::string destination = this->Destination.substr(1);
cmSystemTools::ConvertToUnixSlashes(destination);
+ if(destination.empty())
+ {
+ destination = ".";
+ }
// Use a file install generator.
More information about the Cmake-commits
mailing list