[Cmake-commits] CMake branch, next, updated. v2.8.5-1622-g6e08230

[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  6e08230ad11f360cb6e1589b46e0a29d37a0488d (commit)
       via  1c2ab714af8969ba01c27c9fb031066ba514afcb (commit)
       via  721133dc45d9f15153e6df3ba86f9c2353d93913 (commit)
      from  727138c87b466cceb8aea016ae9ae81e7621b335 (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=6e08230ad11f360cb6e1589b46e0a29d37a0488d
commit 6e08230ad11f360cb6e1589b46e0a29d37a0488d
Merge: 727138c 1c2ab71
Author:     Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Wed Aug 17 03:17:08 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 03:17:08 2011 -0400

    Merge topic 'asn_java_add_more_java_archives' into next
    
    1c2ab71 Modules: Add support for more java archives in add_jar().
    721133d KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2ab714af8969ba01c27c9fb031066ba514afcb
commit 1c2ab714af8969ba01c27c9fb031066ba514afcb
Author:     Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Wed Aug 17 09:14:17 2011 +0200
Commit:     Andreas Schneider <asn at cryptomilk.org>
CommitDate: Wed Aug 17 09:15:21 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:
 Modules/UseJava.cmake             |    5 ++++-
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake