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 4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c (commit)
via 56c11eee13604e163eb5a5d9092df405be0e9a5c (commit)
from d8ac93fff8a91c77294d2c5b062765ebdafdbe1e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c
commit 4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c
Merge: d8ac93f 56c11ee
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 3 09:24:54 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Dec 3 09:24:54 2015 -0500
Merge topic 'UseJava-relative-manifest' into next
56c11eee UseJava: Allow relative path to manifest file just as with other
sources
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56c11eee13604e163eb5a5d9092df405be0e9a5c
commit 56c11eee13604e163eb5a5d9092df405be0e9a5c
Author: Marc Chevrier <marc.chevr...@sap.com>
AuthorDate: Thu Dec 3 12:35:37 2015 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Dec 3 09:24:26 2015 -0500
UseJava: Allow relative path to manifest file just as with other sources
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index dced6ec..6146d78 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -444,7 +444,7 @@ function(add_jar _TARGET_NAME)
if (_add_jar_MANIFEST)
set(_MANIFEST_OPTION m)
- set(_MANIFEST_VALUE ${_add_jar_MANIFEST})
+ get_filename_component (_MANIFEST_VALUE "${_add_jar_MANIFEST}"
ABSOLUTE)
endif ()
if (LIBRARY_OUTPUT_PATH)
-----------------------------------------------------------------------
Summary of changes:
Modules/UseJava.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
