[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2669-gfcdc24b

[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  fcdc24b725e8faf3a64b06ae9b1cda7597469627 (commit)
       via  b41771dfeb0eef25e35da7d3dca13de658a2f8fb (commit)
      from  71a6b621712e1486ab37b2d7a0b0b745411ac5ef (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=fcdc24b725e8faf3a64b06ae9b1cda7597469627
commit fcdc24b725e8faf3a64b06ae9b1cda7597469627
Merge: 71a6b62 b41771d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 19 10:20:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 19 10:20:57 2013 -0400

    Merge topic 'document-add_jar-compat-shims' into next
    
    b41771d UseJava.cmake: document add_jar compat shim


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b41771dfeb0eef25e35da7d3dca13de658a2f8fb
commit b41771dfeb0eef25e35da7d3dca13de658a2f8fb
Author:     Matthew Woehlke <matthew.woehlke at kitware.com>
AuthorDate: Mon Jun 17 12:26:24 2013 -0400
Commit:     Matthew Woehlke <matthew.woehlke at kitware.com>
CommitDate: Mon Jun 17 12:26:24 2013 -0400

    UseJava.cmake: document add_jar compat shim
    
    Document the logic that parses for backward compatibility the old
    variables that were used to control add_jar prior to named argument
    support. In particular, document that the reason this logic exists is
    for backward compatibility, and that new features do not need to add to
    it.

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 9c23127..0242b24 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -221,6 +221,13 @@ set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake)
 
 function(add_jar _TARGET_NAME)
 
+    # In CMake < 2.8.12, add_jar used variables which were set prior to calling
+    # add_jar for customizing the behavior of add_jar. In order to be backwards
+    # compatible, check if any of those variables are set, and use them to
+    # initialize values of the named arguments. (Giving the corresponding named
+    # argument will override the value set here.)
+    #
+    # New features should use named arguments only.
     if(DEFINED CMAKE_JAVA_TARGET_VERSION)
         set(_add_jar_VERSION "${CMAKE_JAVA_TARGET_VERSION}")
     endif()

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

Summary of changes:
 Modules/UseJava.cmake |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake