mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

UseJava: Use list(APPEND) to simplify javadoc option construction

Browse Source
This commit is contained in:
Nathan Burles
2019-11-04 10:40:42 +00:00
committed by Brad King
parent c7a4b1a58e
commit 1b27ac78ac
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/UseJava.cmake
View File

@@ -1199,7 +1199,7 @@ function(create_javadoc _target)
set(_sourcepath ${_sourcepath}:${_path}) set(_sourcepath ${_sourcepath}:${_path})
endif () endif ()
endforeach() endforeach()
set(_javadoc_options ${_javadoc_options} -sourcepath ${_sourcepath}) list(APPEND _javadoc_options -sourcepath ${_sourcepath})
endif () endif ()
if (_javadoc_classpath) if (_javadoc_classpath)
@@ -1212,33 +1212,34 @@ function(create_javadoc _target)
set(_classpath ${_classpath}:${_path}) set(_classpath ${_classpath}:${_path})
endif () endif ()
endforeach() endforeach()
set(_javadoc_options ${_javadoc_options} -classpath "${_classpath}") list(APPEND _javadoc_options -classpath "${_classpath}")
endif () endif ()
if (_javadoc_doctitle) if (_javadoc_doctitle)
set(_javadoc_options ${_javadoc_options} -doctitle '${_javadoc_doctitle}') list(APPEND _javadoc_options -doctitle '${_javadoc_doctitle}')
endif () endif ()
if (_javadoc_windowtitle) if (_javadoc_windowtitle)
set(_javadoc_options ${_javadoc_options} -windowtitle '${_javadoc_windowtitle}') list(APPEND _javadoc_options -windowtitle '${_javadoc_windowtitle}')
endif () endif ()
if (_javadoc_author) if (_javadoc_author)
set(_javadoc_options ${_javadoc_options} -author) list(APPEND _javadoc_options -author)
endif () endif ()
if (_javadoc_use) if (_javadoc_use)
set(_javadoc_options ${_javadoc_options} -use) list(APPEND _javadoc_options -use)
endif () endif ()
if (_javadoc_version) if (_javadoc_version)
set(_javadoc_options ${_javadoc_options} -version) list(APPEND _javadoc_options -version)
endif () endif ()
add_custom_target(${_target}_javadoc ALL add_custom_target(${_target}_javadoc ALL
COMMAND ${Java_JAVADOC_EXECUTABLE} ${_javadoc_options} COMMAND ${Java_JAVADOC_EXECUTABLE}
${_javadoc_files} ${_javadoc_options}
${_javadoc_packages} ${_javadoc_files}
${_javadoc_packages}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )