[Cmake-commits] [cmake-commits] hoffman committed cmTarget.h 1.109.2.2 1.109.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmTarget.h 
Log Message:
ENH: merge from main tree


Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.109.2.2
retrieving revision 1.109.2.3
diff -C 2 -d -r1.109.2.2 -r1.109.2.3
*** cmTarget.h	8 Apr 2008 16:22:51 -0000	1.109.2.2
--- cmTarget.h	8 Apr 2008 20:26:07 -0000	1.109.2.3
***************
*** 472,476 ****
    // Get the full path to the target output directory.
    std::string GetOutputDir(bool implib);
!   std::string const& cmTarget::ComputeBaseOutputDir(bool implib);
  
    const char* ImportedGetLocation(const char* config);
--- 472,476 ----
    // Get the full path to the target output directory.
    std::string GetOutputDir(bool implib);
!   std::string const& ComputeBaseOutputDir(bool implib);
  
    const char* ImportedGetLocation(const char* config);