[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3061-g27f0100

[Stephen Kelly]

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  27f010028cc223e4da7195068ce167dd07d6100c (commit)
       via  80bcc794613f36e9352a7d72b4bfc979012ba41e (commit)
      from  57b4524fa6c4a84812b80bcee5000b6119dd6b39 (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=27f010028cc223e4da7195068ce167dd07d6100c
commit 27f010028cc223e4da7195068ce167dd07d6100c
Merge: 57b4524 80bcc79
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 12 10:57:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 12 10:57:29 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    80bcc79 Fix erroneous errors from the dashboard.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80bcc794613f36e9352a7d72b4bfc979012ba41e
commit 80bcc794613f36e9352a7d72b4bfc979012ba41e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 12 16:56:08 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 12 16:56:08 2013 +0200

    Fix erroneous errors from the dashboard.
    
    C:\Dashboards\My Tests\CMakeNMake60-src\Source\cmTarget.cxx(3449) : error C2562: 'processCompileOptions' : 'void' function returning a value
            C:\Dashboards\My Tests\CMakeNMake60-src\Source\cmTarget.cxx(3440) : see declaration of 'processCompileOptions'
    C:\Dashboards\My Tests\CMakeNMake60-src\Source\cmTarget.cxx(3557) : error C2562: 'processCompileDefinitions' : 'void' function returning a value
            C:\Dashboards\My Tests\CMakeNMake60-src\Source\cmTarget.cxx(3548) : see declaration of 'processCompileDefinitions'

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index da5566a..a56eb9e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3335,9 +3335,8 @@ static void processCompileOptions(cmTarget *tgt,
       cmGeneratorExpressionDAGChecker *dagChecker,
       const char *config, bool debugOptions)
 {
-  return processCompileOptionsInternal(tgt, entries, options, uniqueOptions,
-                                       dagChecker, config, debugOptions,
-                                       "options");
+  processCompileOptionsInternal(tgt, entries, options, uniqueOptions,
+                                dagChecker, config, debugOptions, "options");
 }
 
 //----------------------------------------------------------------------------
@@ -3443,9 +3442,9 @@ static void processCompileDefinitions(cmTarget *tgt,
       cmGeneratorExpressionDAGChecker *dagChecker,
       const char *config, bool debugOptions)
 {
-  return processCompileOptionsInternal(tgt, entries, options, uniqueOptions,
-                                       dagChecker, config, debugOptions,
-                                       "definitions");
+  processCompileOptionsInternal(tgt, entries, options, uniqueOptions,
+                                dagChecker, config, debugOptions,
+                                "definitions");
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmTarget.cxx |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake