[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2504-g07d403d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  07d403d033c33dcb5250a03ff5d901719e2f3bb2 (commit)
       via  e4e76f286c2eb5cfa822f89145611d02dc9d39b3 (commit)
       via  149ce5db5ed52855514e3ee3eef45295e667eed4 (commit)
      from  31a042769fb0b809841e76987cb8eb9ddaeb0eae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07d403d033c33dcb5250a03ff5d901719e2f3bb2
commit 07d403d033c33dcb5250a03ff5d901719e2f3bb2
Merge: 31a0427 e4e76f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 22 12:52:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 22 12:52:20 2014 -0400

    Merge topic 'osx-CFBundle-info-plist' into next
    
    e4e76f28 Merge branch 'master' into osx-CFBundle-info-plist
    149ce5db OS X: Fix Info.plist placement in a CFBundle


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4e76f286c2eb5cfa822f89145611d02dc9d39b3
commit e4e76f286c2eb5cfa822f89145611d02dc9d39b3
Merge: 149ce5d ede0419
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 22 12:51:55 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 22 12:51:55 2014 -0400

    Merge branch 'master' into osx-CFBundle-info-plist
    
    Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
    the side from 'master'.

diff --cc Modules/Qt4Macros.cmake
index 5ada030,aca8996..23c4fc0
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@@ -141,10 -141,10 +141,10 @@@ function (QT4_CREATE_MOC_COMMAND infil
    set(_moc_extra_parameters_file @${_moc_parameters_file})
    add_custom_command(OUTPUT ${outfile}
                        COMMAND Qt4::moc ${_moc_extra_parameters_file}
-                       DEPENDS ${infile}
+                       DEPENDS ${infile} ${_moc_parameters_file}
                        ${_moc_working_dir}
                        VERBATIM)
 -endmacro ()
 +endfunction ()
  
  
  macro (QT4_GENERATE_MOC infile outfile )
diff --cc Source/cmMakefile.cxx
index 27ce999,dce71de..b0ff258
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -911,8 -908,11 +911,8 @@@ cmMakefile::AddCustomCommandToTarget(co
  
      if(issueMessage)
        {
 -      cmOStringStream e;
 -      e << (this->GetPolicies()
 -        ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n";
        e << "The target name \"" << target << "\" is unknown in this context.";
-       IssueMessage(messageType, e.str().c_str());
+       IssueMessage(messageType, e.str());
        }
  
        return;
diff --cc Source/cmMakefile.h
index f00fd20,460a85c..8ff6daa
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@@ -872,17 -877,15 +877,17 @@@ public
    void AddQtUiFileWithOptions(cmSourceFile *sf);
    std::vector<cmSourceFile*> GetQtUiFilesWithOptions() const;
  
-   std::set<cmStdString> const & GetSystemIncludeDirectories() const
+   std::set<std::string> const & GetSystemIncludeDirectories() const
      { return this->SystemIncludeDirectories; }
  
 +  bool PolicyOptionalWarningEnabled(std::string const& var);
 +
  protected:
    // add link libraries and directories to the target
-   void AddGlobalLinkInformation(const char* name, cmTarget& target);
+   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
  
    // Check for a an unused variable
-   void CheckForUnused(const char* reason, const char* name) const;
+   void CheckForUnused(const char* reason, const std::string& name) const;
  
    std::string Prefix;
    std::vector<std::string> AuxSourceDirectories; //
diff --cc Source/cmTargetLinkLibrariesCommand.cxx
index 95a2cba,115a988..1c2e625
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@@ -122,10 -119,12 +122,10 @@@ bool cmTargetLinkLibrariesComman
        }
      if (modal)
        {
 -      cmOStringStream e;
 -      e << this->Makefile->GetPolicies()
 -                            ->GetPolicyWarning(cmPolicies::CMP0039) << "\n"
 +      e <<
          "Utility target \"" << this->Target->GetName() << "\" " << modal
          << " not be used as the target of a target_link_libraries call.";
-       this->Makefile->IssueMessage(messageType, e.str().c_str());
+       this->Makefile->IssueMessage(messageType, e.str());
        if(messageType == cmake::FATAL_ERROR)
          {
          return false;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=149ce5db5ed52855514e3ee3eef45295e667eed4
commit 149ce5db5ed52855514e3ee3eef45295e667eed4
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Tue Mar 25 16:16:51 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 22 12:48:44 2014 -0400

    OS X: Fix Info.plist placement in a CFBundle
    
    Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
    same root directory as the rest of the bundle.  Without this, Info.plist
    was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
    the target path was not generated correctly.

diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 9a340dc..448d77c 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -178,7 +178,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
 
   // Configure the Info.plist file.  Note that it needs the executable name
   // to be set.
-  std::string plist =
+  std::string plist = root + "/" +
     this->Target->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
   this->LocalGenerator->GenerateAppleInfoPList(this->Target,

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake