[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4274-gadcf418

[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  adcf418e07466d89c6501d553ed9e4aeaccde2f7 (commit)
       via  69aff17d384e1ebb9afb828ad8ad094d503b9dee (commit)
       via  fe5e1930206e6f704ec42f09e998c88f8ee9ef3b (commit)
       via  ee6b7a8a181fcbf27f432320dd9bdf6d35c46b4e (commit)
      from  45bb6fa409c8165d4b0e3153203d87bab5152731 (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=adcf418e07466d89c6501d553ed9e4aeaccde2f7
commit adcf418e07466d89c6501d553ed9e4aeaccde2f7
Merge: 45bb6fa 69aff17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 23 09:10:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 23 09:10:17 2013 -0400

    Merge topic 'UseJava-jar-manifest' into next
    
    69aff17 UseJava: Add support for the jar 'm' (Manifest) option
    fe5e193 CMake Nightly Date Stamp
    ee6b7a8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69aff17d384e1ebb9afb828ad8ad094d503b9dee
commit 69aff17d384e1ebb9afb828ad8ad094d503b9dee
Author:     Simon Levermann <simon at levermaenner.de>
AuthorDate: Mon Sep 23 02:57:14 2013 +0200
Commit:     Simon Levermann <simon at levermaenner.de>
CommitDate: Mon Sep 23 14:54:33 2013 +0200

    UseJava: Add support for the jar 'm' (Manifest) option

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index c0fd07c..c9635b5 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -49,6 +49,11 @@
 #
 #       add_jar(example ENTRY_POINT com/examples/MyProject/Main)
 #
+#   To define a custom manifest for the jar, you can set it with the manifest
+#   named argument:
+#
+#       add_jar(example MANIFEST /path/to/manifest)
+#
 #   To add a VERSION to the target output name you can set it using
 #   the VERSION named argument to add_jar. This will create a jar file with the
 #   name shibboleet-1.0.0.jar and will create a symlink shibboleet.jar
@@ -246,7 +251,7 @@ function(add_jar _TARGET_NAME)
 
     cmake_parse_arguments(_add_jar
       ""
-      "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT"
+      "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST"
       "SOURCES;INCLUDE_JARS"
       ${ARGN}
     )
@@ -262,6 +267,11 @@ function(add_jar _TARGET_NAME)
         set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT})
     endif ()
 
+    if (_add_jar_MANIFEST)
+        set(_MANIFEST_OPTION m)
+        set(_MANIFEST_VALUE ${_add_jar_MANIFEST})
+    endif ()
+
     if (LIBRARY_OUTPUT_PATH)
         set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
     else ()
@@ -405,7 +415,7 @@ function(add_jar _TARGET_NAME)
         add_custom_command(
             OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
             COMMAND ${Java_JAR_EXECUTABLE}
-                -cf${_ENTRY_POINT_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE}
+                -cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE}
                 ${_JAVA_RESOURCE_FILES} @java_class_filelist
             COMMAND ${CMAKE_COMMAND}
                 -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
@@ -425,7 +435,7 @@ function(add_jar _TARGET_NAME)
         add_custom_command(
             OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
             COMMAND ${Java_JAR_EXECUTABLE}
-                -cf${_ENTRY_POINT_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE}
+                -cf${_ENTRY_POINT_OPTION}${_MANIFEST_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE} ${_MANIFEST_VALUE}
                 ${_JAVA_RESOURCE_FILES} @java_class_filelist
             COMMAND ${CMAKE_COMMAND}
                 -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}

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

Summary of changes:
 Modules/UseJava.cmake     |   16 +++++++++++++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake