[Cmake-commits] [cmake-commits] king committed cmComputeLinkInformation.cxx 1.39 1.40 cmOrderDirectories.cxx 1.5 1.6 cmOrderDirectories.h 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	cmComputeLinkInformation.cxx cmOrderDirectories.cxx 
	cmOrderDirectories.h 
Log Message:
ENH: Provide context in path ordering warnings


Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -C 2 -d -r1.39 -r1.40
*** cmComputeLinkInformation.cxx	29 Jul 2008 14:51:46 -0000	1.39
--- cmComputeLinkInformation.cxx	29 Jul 2008 18:01:04 -0000	1.40
***************
*** 257,264 ****
    // Allocate internals.
    this->OrderLinkerSearchPath =
!     new cmOrderDirectories(this->GlobalGenerator, target->GetName(),
                             "linker search path");
    this->OrderRuntimeSearchPath =
!     new cmOrderDirectories(this->GlobalGenerator, target->GetName(),
                             "runtime search path");
    this->OrderDependentRPath = 0;
--- 257,264 ----
    // Allocate internals.
    this->OrderLinkerSearchPath =
!     new cmOrderDirectories(this->GlobalGenerator, target,
                             "linker search path");
    this->OrderRuntimeSearchPath =
!     new cmOrderDirectories(this->GlobalGenerator, target,
                             "runtime search path");
    this->OrderDependentRPath = 0;
***************
*** 363,367 ****
      this->SharedDependencyMode = SharedDepModeDir;
      this->OrderDependentRPath =
!       new cmOrderDirectories(this->GlobalGenerator, target->GetName(),
                               "dependent library path");
      }
--- 363,367 ----
      this->SharedDependencyMode = SharedDepModeDir;
      this->OrderDependentRPath =
!       new cmOrderDirectories(this->GlobalGenerator, target,
                               "dependent library path");
      }

Index: cmOrderDirectories.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderDirectories.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmOrderDirectories.cxx	29 Jul 2008 18:00:59 -0000	1.5
--- cmOrderDirectories.cxx	29 Jul 2008 18:01:04 -0000	1.6
***************
*** 19,22 ****
--- 19,23 ----
  #include "cmGlobalGenerator.h"
  #include "cmSystemTools.h"
+ #include "cmake.h"
  
  #include <assert.h>
***************
*** 240,248 ****
  //----------------------------------------------------------------------------
  cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg,
!                                        const char* name,
                                         const char* purpose)
  {
    this->GlobalGenerator = gg;
!   this->Name = name;
    this->Purpose = purpose;
    this->Computed = false;
--- 241,249 ----
  //----------------------------------------------------------------------------
  cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg,
!                                        cmTarget* target,
                                         const char* purpose)
  {
    this->GlobalGenerator = gg;
!   this->Target = target;
    this->Purpose = purpose;
    this->Computed = false;
***************
*** 511,516 ****
    // Construct the message.
    cmOStringStream e;
!   e << "WARNING: Cannot generate a safe " << this->Purpose
!     << " for target " << this->Name
      << " because there is a cycle in the constraint graph:\n";
  
--- 512,517 ----
    // Construct the message.
    cmOStringStream e;
!   e << "Cannot generate a safe " << this->Purpose
!     << " for target " << this->Target->GetName()
      << " because there is a cycle in the constraint graph:\n";
  
***************
*** 519,531 ****
      {
      ConflictList const& clist = this->ConflictGraph[i];
!     e << "dir " << i << " is [" << this->OriginalDirectories[i] << "]\n";
      for(ConflictList::const_iterator j = clist.begin();
          j != clist.end(); ++j)
        {
!       e << "  dir " << j->first << " must precede it due to ";
        this->ConstraintEntries[j->second]->Report(e);
        e << "\n";
        }
      }
!   cmSystemTools::Message(e.str().c_str());
  }
--- 520,534 ----
      {
      ConflictList const& clist = this->ConflictGraph[i];
!     e << "  dir " << i << " is [" << this->OriginalDirectories[i] << "]\n";
      for(ConflictList::const_iterator j = clist.begin();
          j != clist.end(); ++j)
        {
!       e << "    dir " << j->first << " must precede it due to ";
        this->ConstraintEntries[j->second]->Report(e);
        e << "\n";
        }
      }
!   e << "Some of these libraries may not be found correctly.";
!   this->GlobalGenerator->GetCMakeInstance()
!     ->IssueMessage(cmake::WARNING, e.str(), this->Target->GetBacktrace());
  }

Index: cmOrderDirectories.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderDirectories.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmOrderDirectories.h	21 Feb 2008 16:41:11 -0000	1.1
--- cmOrderDirectories.h	29 Jul 2008 18:01:04 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  class cmOrderDirectoriesConstraint;
  class cmOrderDirectoriesConstraintLibrary;
+ class cmTarget;
  
  /** \class cmOrderDirectories
***************
*** 32,36 ****
  {
  public:
!   cmOrderDirectories(cmGlobalGenerator* gg, const char* name,
                       const char* purpose);
    ~cmOrderDirectories();
--- 33,37 ----
  {
  public:
!   cmOrderDirectories(cmGlobalGenerator* gg, cmTarget* target,
                       const char* purpose);
    ~cmOrderDirectories();
***************
*** 45,49 ****
  private:
    cmGlobalGenerator* GlobalGenerator;
!   std::string Name;
    std::string Purpose;
  
--- 46,50 ----
  private:
    cmGlobalGenerator* GlobalGenerator;
!   cmTarget* Target;
    std::string Purpose;