summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-07 14:22:43 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-12-07 14:22:43 (GMT)
commitc3bb76dfd2bc732acb8d69ef47dacce9a55a6582 (patch)
tree1e6f5eceeb13ebe9a95bcf4be3582983da187261
parent335314e35f5bbfe4131895e9e877e4a19cd3e806 (diff)
parent56c11eee13604e163eb5a5d9092df405be0e9a5c (diff)
downloadCMake-c3bb76dfd2bc732acb8d69ef47dacce9a55a6582.zip
CMake-c3bb76dfd2bc732acb8d69ef47dacce9a55a6582.tar.gz
CMake-c3bb76dfd2bc732acb8d69ef47dacce9a55a6582.tar.bz2
Merge topic 'UseJava-relative-manifest'
56c11eee UseJava: Allow relative path to manifest file just as with other sources
-rw-r--r--Modules/UseJava.cmake2
1 files changed, 1 insertions, 1 deletions
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)