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

UseJava: Fix add_jar argument parsing (#14655) 

Since commit v2.8.11~63^2 (UseJava.cmake: require explicit request to
include jars, 2013-03-26) the argument parsing always overrides the
variable settings even if the corresponding arguments are not passed.
Re-order logic to fix this.
This commit is contained in:
Mark Studenka 2015-03-19 10:55:00 -04:00 committed by Brad King
parent c95e523db8
commit a21e8df0da
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/UseJava.cmake
View File

@ -340,6 +340,13 @@ set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake)
function(add_jar _TARGET_NAME) function(add_jar _TARGET_NAME)
cmake_parse_arguments(_add_jar
""
"VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST"
"SOURCES;INCLUDE_JARS"
${ARGN}
)
# In CMake < 2.8.12, add_jar used variables which were set prior to calling # 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 # 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 # compatible, check if any of those variables are set, and use them to
@ -347,28 +354,21 @@ function(add_jar _TARGET_NAME)
# argument will override the value set here.) # argument will override the value set here.)
# #
# New features should use named arguments only. # New features should use named arguments only.
if(DEFINED CMAKE_JAVA_TARGET_VERSION) if(NOT DEFINED _add_jar_VERSION AND DEFINED CMAKE_JAVA_TARGET_VERSION)
set(_add_jar_VERSION "${CMAKE_JAVA_TARGET_VERSION}") set(_add_jar_VERSION "${CMAKE_JAVA_TARGET_VERSION}")
endif() endif()
if(DEFINED CMAKE_JAVA_TARGET_OUTPUT_DIR) if(NOT DEFINED _add_jar_OUTPUT_DIR AND DEFINED CMAKE_JAVA_TARGET_OUTPUT_DIR)
set(_add_jar_OUTPUT_DIR "${CMAKE_JAVA_TARGET_OUTPUT_DIR}") set(_add_jar_OUTPUT_DIR "${CMAKE_JAVA_TARGET_OUTPUT_DIR}")
endif() endif()
if(DEFINED CMAKE_JAVA_TARGET_OUTPUT_NAME) if(NOT DEFINED _add_jar_OUTPUT_NAME AND DEFINED CMAKE_JAVA_TARGET_OUTPUT_NAME)
set(_add_jar_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}") set(_add_jar_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}")
# reset # reset
set(CMAKE_JAVA_TARGET_OUTPUT_NAME) set(CMAKE_JAVA_TARGET_OUTPUT_NAME)
endif() endif()
if(DEFINED CMAKE_JAVA_JAR_ENTRY_POINT) if(NOT DEFINED _add_jar_ENTRY_POINT AND DEFINED CMAKE_JAVA_JAR_ENTRY_POINT)
set(_add_jar_ENTRY_POINT "${CMAKE_JAVA_JAR_ENTRY_POINT}") set(_add_jar_ENTRY_POINT "${CMAKE_JAVA_JAR_ENTRY_POINT}")
endif() endif()
cmake_parse_arguments(_add_jar
""
"VERSION;OUTPUT_DIR;OUTPUT_NAME;ENTRY_POINT;MANIFEST"
"SOURCES;INCLUDE_JARS"
${ARGN}
)
set(_JAVA_SOURCE_FILES ${_add_jar_SOURCES} ${_add_jar_UNPARSED_ARGUMENTS}) set(_JAVA_SOURCE_FILES ${_add_jar_SOURCES} ${_add_jar_UNPARSED_ARGUMENTS})
if (NOT DEFINED _add_jar_OUTPUT_DIR) if (NOT DEFINED _add_jar_OUTPUT_DIR)