[Cmake-commits] CMake branch, next, updated. v2.8.12-3639-gef5a2f31

Brad King brad.king at kitware.com
Tue Oct 8 09:44:20 EDT 2013 

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  ef5a2f31b3179eca559d8c7ad087a347a8b7610f (commit)
       via  1603fe092d217781739011faa31268ccba2b4390 (commit)
       via  faf10d0f95de7174a86493c21c03b16cba06fec7 (commit)
       via  705d70edf12609ae2738db19b4d1fd96c839a0bd (commit)
      from  aeb4cdbf2997deef2afe0d76543ec377500d9f20 (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=ef5a2f31b3179eca559d8c7ad087a347a8b7610f
commit ef5a2f31b3179eca559d8c7ad087a347a8b7610f
Merge: aeb4cdb 1603fe0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 09:44:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 09:44:17 2013 -0400

    Merge topic 'CheckStructHasMember_CXX' into next
    
    1603fe0 Merge branch 'deprecation-message' into CheckStructHasMember_CXX
    faf10d0 message: Document DEPRECATION mode
    705d70e Rename test RunCMake.{deprecation => message}


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1603fe092d217781739011faa31268ccba2b4390
commit 1603fe092d217781739011faa31268ccba2b4390
Merge: e04402f faf10d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 09:40:09 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 09:40:09 2013 -0400

    Merge branch 'deprecation-message' into CheckStructHasMember_CXX
    
    Resolve conflict in Tests/RunCMake/CMakeLists.txt by combining both
    changes.

diff --cc Tests/RunCMake/CMakeLists.txt
index f1c09bc,9a7f487..5b9fe38
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -119,5 -120,3 +120,4 @@@ endif(
  add_RunCMake_test(File_Generate)
  add_RunCMake_test(ExportWithoutLanguage)
  add_RunCMake_test(target_link_libraries)
- add_RunCMake_test(deprecation)
 +add_RunCMake_test(CheckModules)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faf10d0f95de7174a86493c21c03b16cba06fec7
commit faf10d0f95de7174a86493c21c03b16cba06fec7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 09:36:27 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 09:36:27 2013 -0400

    message: Document DEPRECATION mode

diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h
index fc61810..a053bdd 100644
--- a/Source/cmMessageCommand.h
+++ b/Source/cmMessageCommand.h
@@ -60,9 +60,8 @@ public:
   virtual const char* GetFullDocumentation() const
     {
     return
-      "  message([STATUS|WARNING|AUTHOR_WARNING|FATAL_ERROR|SEND_ERROR]\n"
-      "          \"message to display\" ...)\n"
-      "The optional keyword determines the type of message:\n"
+      "  message([<mode>] \"message to display\" ...)\n"
+      "The optional <mode> keyword determines the type of message:\n"
       "  (none)         = Important information\n"
       "  STATUS         = Incidental information\n"
       "  WARNING        = CMake Warning, continue processing\n"
@@ -70,6 +69,9 @@ public:
       "  SEND_ERROR     = CMake Error, continue processing,\n"
       "                                but skip generation\n"
       "  FATAL_ERROR    = CMake Error, stop processing and generation\n"
+      "  DEPRECATION    = CMake Deprecation Error or Warning if variable\n"
+      "                   CMAKE_ERROR_DEPRECATED or CMAKE_WARN_DEPRECATED\n"
+      "                   is enabled, respectively, else no message.\n"
       "The CMake command-line tool displays STATUS messages on stdout "
       "and all other message types on stderr.  "
       "The CMake GUI displays all messages in its log area.  "

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=705d70edf12609ae2738db19b4d1fd96c839a0bd
commit 705d70edf12609ae2738db19b4d1fd96c839a0bd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 09:26:46 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 09:29:11 2013 -0400

    Rename test RunCMake.{deprecation => message}
    
    It covers message() command cases.  Others could be added later.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index cc52e9e..9a7f487 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -95,6 +95,7 @@ add_RunCMake_test(if)
 add_RunCMake_test(include)
 add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
+add_RunCMake_test(message)
 add_RunCMake_test(try_compile)
 add_RunCMake_test(variable_watch)
 add_RunCMake_test(CMP0004)
@@ -119,4 +120,3 @@ endif()
 add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
-add_RunCMake_test(deprecation)
diff --git a/Tests/RunCMake/deprecation/CMakeLists.txt b/Tests/RunCMake/message/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/CMakeLists.txt
rename to Tests/RunCMake/message/CMakeLists.txt
diff --git a/Tests/RunCMake/deprecation/RunCMakeTest.cmake b/Tests/RunCMake/message/RunCMakeTest.cmake
similarity index 100%
rename from Tests/RunCMake/deprecation/RunCMakeTest.cmake
rename to Tests/RunCMake/message/RunCMakeTest.cmake
diff --git a/Tests/RunCMake/deprecation/errormessage-result.txt b/Tests/RunCMake/message/errormessage-result.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/errormessage-result.txt
rename to Tests/RunCMake/message/errormessage-result.txt
diff --git a/Tests/RunCMake/deprecation/errormessage-stderr.txt b/Tests/RunCMake/message/errormessage-stderr.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/errormessage-stderr.txt
rename to Tests/RunCMake/message/errormessage-stderr.txt
diff --git a/Tests/RunCMake/deprecation/errormessage.cmake b/Tests/RunCMake/message/errormessage.cmake
similarity index 100%
rename from Tests/RunCMake/deprecation/errormessage.cmake
rename to Tests/RunCMake/message/errormessage.cmake
diff --git a/Tests/RunCMake/deprecation/nomessage-result.txt b/Tests/RunCMake/message/nomessage-result.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/nomessage-result.txt
rename to Tests/RunCMake/message/nomessage-result.txt
diff --git a/Tests/RunCMake/deprecation/nomessage-stderr.txt b/Tests/RunCMake/message/nomessage-stderr.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/nomessage-stderr.txt
rename to Tests/RunCMake/message/nomessage-stderr.txt
diff --git a/Tests/RunCMake/deprecation/nomessage.cmake b/Tests/RunCMake/message/nomessage.cmake
similarity index 100%
rename from Tests/RunCMake/deprecation/nomessage.cmake
rename to Tests/RunCMake/message/nomessage.cmake
diff --git a/Tests/RunCMake/deprecation/warnmessage-result.txt b/Tests/RunCMake/message/warnmessage-result.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/warnmessage-result.txt
rename to Tests/RunCMake/message/warnmessage-result.txt
diff --git a/Tests/RunCMake/deprecation/warnmessage-stderr.txt b/Tests/RunCMake/message/warnmessage-stderr.txt
similarity index 100%
rename from Tests/RunCMake/deprecation/warnmessage-stderr.txt
rename to Tests/RunCMake/message/warnmessage-stderr.txt
diff --git a/Tests/RunCMake/deprecation/warnmessage.cmake b/Tests/RunCMake/message/warnmessage.cmake
similarity index 100%
rename from Tests/RunCMake/deprecation/warnmessage.cmake
rename to Tests/RunCMake/message/warnmessage.cmake

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

Summary of changes:
 Source/cmMessageCommand.h                          |    8 +++++---
 Tests/RunCMake/CMakeLists.txt                      |    2 +-
 Tests/RunCMake/deprecation/errormessage-result.txt |    1 -
 .../{deprecation => message}/CMakeLists.txt        |    0
 .../{deprecation => message}/RunCMakeTest.cmake    |    0
 .../errormessage-result.txt}                       |    0
 .../errormessage-stderr.txt                        |    0
 .../{deprecation => message}/errormessage.cmake    |    0
 .../{deprecation => message}/nomessage-result.txt  |    0
 .../{deprecation => message}/nomessage-stderr.txt  |    0
 .../{deprecation => message}/nomessage.cmake       |    0
 .../warnmessage-result.txt                         |    0
 .../warnmessage-stderr.txt                         |    0
 .../{deprecation => message}/warnmessage.cmake     |    0
 14 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 Tests/RunCMake/deprecation/errormessage-result.txt
 rename Tests/RunCMake/{deprecation => message}/CMakeLists.txt (100%)
 rename Tests/RunCMake/{deprecation => message}/RunCMakeTest.cmake (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => message/errormessage-result.txt} (100%)
 rename Tests/RunCMake/{deprecation => message}/errormessage-stderr.txt (100%)
 rename Tests/RunCMake/{deprecation => message}/errormessage.cmake (100%)
 rename Tests/RunCMake/{deprecation => message}/nomessage-result.txt (100%)
 rename Tests/RunCMake/{deprecation => message}/nomessage-stderr.txt (100%)
 rename Tests/RunCMake/{deprecation => message}/nomessage.cmake (100%)
 rename Tests/RunCMake/{deprecation => message}/warnmessage-result.txt (100%)
 rename Tests/RunCMake/{deprecation => message}/warnmessage-stderr.txt (100%)
 rename Tests/RunCMake/{deprecation => message}/warnmessage.cmake (100%)


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list