[Cmake-commits] CMake branch, next, updated. v2.8.5-1792-ga7ddc2f

[Andreas Schneider]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a7ddc2fd05eb6d1cc87c121d00c0ce35c03a0223 (commit)
       via  e01b98ee4d755acc458d69296cedfdf068d074b7 (commit)
      from  7692baad47d8a4266b14e6c4a04171c3432f9b19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7ddc2fd05eb6d1cc87c121d00c0ce35c03a0223
commit a7ddc2fd05eb6d1cc87c121d00c0ce35c03a0223
Merge: 7692baa e01b98e
Author:     Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Fri Sep 2 03:41:59 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 03:41:59 2011 -0400

    Merge topic 'asn_java_add_more_java_archives' into next
    
    e01b98e Modules: Add support for more java archives in add_jar().


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e01b98ee4d755acc458d69296cedfdf068d074b7
commit e01b98ee4d755acc458d69296cedfdf068d074b7
Author:     Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Wed Aug 17 09:14:17 2011 +0200
Commit:     Andreas Schneider <asn at cryptomilk.org>
CommitDate: Mon Aug 29 08:51:45 2011 +0200

    Modules: Add support for more java archives in add_jar().

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 "")

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake