diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-07 19:36:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-07 19:36:41 (GMT) |
| commit | 56ce5dec8b9973528ae8b41a77e757c11eff81b1 (patch) | |
| tree | 1e4e83677ae470332c09435ae46aff07b73b4b44 /Modules | |
| parent | 5686515b6f9bc91d4a5b78f5a0d322cc5ab62f2b (diff) | |
| parent | e01b98ee4d755acc458d69296cedfdf068d074b7 (diff) | |
| download | CMake-56ce5dec8b9973528ae8b41a77e757c11eff81b1.zip CMake-56ce5dec8b9973528ae8b41a77e757c11eff81b1.tar.gz CMake-56ce5dec8b9973528ae8b41a77e757c11eff81b1.tar.bz2 | |
Merge topic 'asn_java_add_more_java_archives'
e01b98e Modules: Add support for more java archives in add_jar().
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/UseJava.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index 869394d..b78278c 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -262,7 +262,10 @@ function(add_jar _TARGET_NAME) set(_JAVA_CLASS_FILE "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_REL_PATH}/${_JAVA_FILE}.class") set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES} ${_JAVA_CLASS_FILE}) - elseif (_JAVA_EXT MATCHES ".jar") + elseif (_JAVA_EXT MATCHES ".jar" + OR _JAVA_EXT MATCHES ".war" + OR _JAVA_EXT MATCHES ".ear" + OR _JAVA_EXT MATCHES ".sar") list(APPEND CMAKE_JAVA_INCLUDE_PATH ${_JAVA_SOURCE_FILE}) elseif (_JAVA_EXT STREQUAL "") |