kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'UseJava-jar-manifest' 

69aff17 UseJava: Add support for the jar 'm' (Manifest) option
This commit is contained in:
Brad King 2013-10-07 15:44:43 -04:00 committed by CMake Topic Stage
parent c76b380181 69aff17d38
commit fcfd409ad1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/UseJava.cmake
View File

@ -49,6 +49,11 @@
# #
# add_jar(example ENTRY_POINT com/examples/MyProject/Main) # 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 # 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 # 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 # 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 cmake_parse_arguments(_add_jar
"" ""
"VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT" "VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST"
"SOURCES;INCLUDE_JARS" "SOURCES;INCLUDE_JARS"
${ARGN} ${ARGN}
) )
@ -262,6 +267,11 @@ function(add_jar _TARGET_NAME)
set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT}) set(_ENTRY_POINT_VALUE ${_add_jar_ENTRY_POINT})
endif () endif ()
if (_add_jar_MANIFEST)
set(_MANIFEST_OPTION m)
set(_MANIFEST_VALUE ${_add_jar_MANIFEST})
endif ()
if (LIBRARY_OUTPUT_PATH) if (LIBRARY_OUTPUT_PATH)
set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}) set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
else () else ()
@ -405,7 +415,7 @@ function(add_jar _TARGET_NAME)
add_custom_command( add_custom_command(
OUTPUT ${_JAVA_JAR_OUTPUT_PATH} OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
COMMAND ${Java_JAR_EXECUTABLE} 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 ${_JAVA_RESOURCE_FILES} @java_class_filelist
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR} -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}
@ -425,7 +435,7 @@ function(add_jar _TARGET_NAME)
add_custom_command( add_custom_command(
OUTPUT ${_JAVA_JAR_OUTPUT_PATH} OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
COMMAND ${Java_JAR_EXECUTABLE} 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 ${_JAVA_RESOURCE_FILES} @java_class_filelist
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR} -D_JAVA_TARGET_DIR=${_add_jar_OUTPUT_DIR}