From e7276c3764620f3c0b8f9dd1f09bccd948a54fbf Mon Sep 17 00:00:00 2001
From: Frank Glinka <glinkaf@uni-muenster.de>
Date: Thu, 19 Jan 2012 11:44:12 +0100
Subject: [PATCH] Add options to add_jar allowing to provide a manifest file
 or main-class file.

---
 Modules/UseJava.cmake |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index b78278c..57c29ea 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -25,6 +25,18 @@
 #       set(CMAKE_JAVA_TARGET_OUTPUT_NAME shibboleet.jar)
 #       add_jar(foobar foobar.java)
 #
+#   To include 'name : value' attribute pairs from a manifest file in the
+#   created jar at META-INF/MANIFEST.MF you can set the manifest file with:
+#
+#       set(CMAKE_JAVA_MANIFEST mymanifest.mf)
+#       add_jar(foobar foobar.java)
+#
+#   To set a class as the application entry point for stand-alone 
+#   applications bundled into an executable jar you can set its name with:
+#
+#       set(CMAKE_JAVA_EXECUTABLE foo/Main)
+#       add_jar(foobar foo/Main.java)
+#
 #   To add a VERSION to the target output name you can set it using
 #   CMAKE_JAVA_TARGET_VERSION. This will create a jar file with the name
 #   shibboleet-1.0.0.jar and will create a symlink shibboleet.jar
@@ -311,12 +323,23 @@ function(add_jar _TARGET_NAME)
         )
     endif (_JAVA_COMPILE_FILES)
 
+    # define jar file options
+    set(_JAVA_JAR_EXECUTABLE_OPTIONS "-cf")   # default options for creating a jar file
+    if(CMAKE_JAVA_MANIFEST)
+       set(_JAVA_JAR_EXECUTABLE_OPTIONS "${_JAVA_JAR_EXECUTABLE_OPTIONS}m")
+    endif(CMAKE_JAVA_MANIFEST)
+    if(CMAKE_JAVA_EXECUTABLE)
+       set(_JAVA_JAR_EXECUTABLE_OPTIONS "${_JAVA_JAR_EXECUTABLE_OPTIONS}e")
+    endif(CMAKE_JAVA_EXECUTABLE)
+      
+
     # create the jar file
     if (CMAKE_JNI_TARGET)
         add_custom_command(
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
             COMMAND ${Java_JAR_EXECUTABLE}
-                -cf ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+                ${_JAVA_JAR_EXECUTABLE_OPTIONS} ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+                ${CMAKE_JAVA_MANIFEST} ${CMAKE_JAVA_EXECUTABLE}
                 ${_JAVA_RESOURCE_FILES} @java_class_filelist
             COMMAND ${CMAKE_COMMAND}
                 -D_JAVA_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}
@@ -328,7 +351,7 @@ function(add_jar _TARGET_NAME)
                 -D_JAVA_TARGET_OUTPUT_NAME=${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
                 -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
                 -P ${_JAVA_SYMLINK_SCRIPT}
-            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            DEPENDS ${CMAKE_JAVA_MANIFEST} ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
             WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
             COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
         )
@@ -336,7 +359,8 @@ function(add_jar _TARGET_NAME)
         add_custom_command(
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
             COMMAND ${Java_JAR_EXECUTABLE}
-                -cf ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+                ${_JAVA_JAR_EXECUTABLE_OPTIONS} ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+                ${CMAKE_JAVA_MANIFEST} ${CMAKE_JAVA_EXECUTABLE}
                 ${_JAVA_RESOURCE_FILES} @java_class_filelist
             COMMAND ${CMAKE_COMMAND}
                 -D_JAVA_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}
@@ -344,7 +368,7 @@ function(add_jar _TARGET_NAME)
                 -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
                 -P ${_JAVA_SYMLINK_SCRIPT}
             WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            DEPENDS ${CMAKE_JAVA_MANIFEST} ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
             COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
         )
     endif (CMAKE_JNI_TARGET)
-- 
1.7.8.msysgit.0

From 4a1b6ab8494383a2b1eb9589742a97fc4f65bdcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= <sebp@k-d-w.org>
Date: Wed, 25 Sep 2013 12:10:15 +0200
Subject: [PATCH] Add MANIFEST option to add_jar

MANIFEST conflicts with ENTRY_POINT, thus it is only allowed to specify one of these options.

See http://public.kitware.com/Bug/view.php?id=12886
---
 Modules/UseJava.cmake | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index c0fd07c..724c96c 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -6,7 +6,7 @@
 # add_jar(target_name
 #         [SOURCES] source1 [source2 ...] [resource1 ...]
 #         [INCLUDE_JARS jar1 [jar2 ...]]
-#         [ENTRY_POINT entry]
+#         [ENTRY_POINT entry] | [MANIFEST manifest]
 #         [VERSION version]
 #         [OUTPUT_NAME name]
 #         [OUTPUT_DIR dir]
@@ -49,6 +49,11 @@
 #
 #       add_jar(example ENTRY_POINT com/examples/MyProject/Main)
 #
+#   To include 'name : value' attribute pairs from a manifest file in the
+#   created jar at META-INF/MANIFEST.MF you can set the manifest file with:
+#
+#       add_jar(foobar foobar.java MANIFEST shibboleet.mf)
+#
 #   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}
     )
@@ -257,11 +262,20 @@ function(add_jar _TARGET_NAME)
         set(_add_jar_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 
+    if (_add_jar_ENTRY_POINT AND _add_jar_MANIFEST)
+      message(SEND_ERROR: "add_jar: ENTRY_POINT and MANIFEST cannot be used at the same time")
+    endif()
+
     if (_add_jar_ENTRY_POINT)
         set(_ENTRY_POINT_OPTION e)
         set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT})
     endif ()
 
+    if (_add_jar_MANIFEST)
+      set(_MANIFEST_OPTION m)
+      set(_MANIFEST_VALUE ${CMAKE_CURRENT_SOURCE_DIR}/${_add_jar_MANIFEST})
+    endif ()
+
     if (LIBRARY_OUTPUT_PATH)
         set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
     else ()
@@ -405,7 +419,8 @@ 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}
@@ -417,7 +432,7 @@ function(add_jar _TARGET_NAME)
                 -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_JAR_OUTPUT_PATH}
                 -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
                 -P ${_JAVA_SYMLINK_SCRIPT}
-            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            DEPENDS ${_add_jar_MANIFEST} ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
             WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
             COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
         )
@@ -425,7 +440,8 @@ 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}
@@ -433,7 +449,7 @@ function(add_jar _TARGET_NAME)
                 -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
                 -P ${_JAVA_SYMLINK_SCRIPT}
             WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
+            DEPENDS ${_add_jar_MANIFEST} ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
             COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
         )
     endif ()
-- 
1.8.3.1