[Cmake-commits] [cmake-commits] king committed cmFindPackageCommand.cxx 1.59 1.60

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Aug 5 09:56:04 EDT 2009


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

Modified Files:
	cmFindPackageCommand.cxx 
Log Message:
Fix find_package for cmake-gui registry entry

The find_package commands looks at the "WhereBuild" registry entries
created by CMakeSetup and cmake-gui hoping that the project was recently
built.  CMakeSetup created WhereBuild1..WhereBuild10 but cmake-gui
creates WhereBuild0-WhereBuild9.

This fixes find_package to look at WhereBuild0 so that the most recently
configured project can be found.  It is important in the case that the
package to be found was the last one configured in cmake-gui but the
current project that is finding it is configured from the command line.


Index: cmFindPackageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.cxx,v
retrieving revision 1.59
retrieving revision 1.60
diff -C 2 -d -r1.59 -r1.60
*** cmFindPackageCommand.cxx	19 Apr 2009 16:48:23 -0000	1.59
--- cmFindPackageCommand.cxx	5 Aug 2009 13:56:02 -0000	1.60
***************
*** 1138,1142 ****
      {
      // It is likely that CMake will have recently built the project.
!     for(int i=1; i <= 10; ++i)
        {
        cmOStringStream r;
--- 1138,1142 ----
      {
      // It is likely that CMake will have recently built the project.
!     for(int i=0; i <= 10; ++i)
        {
        cmOStringStream r;



More information about the Cmake-commits mailing list