summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-12-13 15:01:45 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-12-13 15:02:14 (GMT)
commit6589f67fb725df68836646ab1e30f496d58f9e36 (patch)
treefc7388b7be144ec47d6ce1fbdf1be6f7ce302e8e
parenteef87a37cdfe6493dd292e1278771a8c6c819242 (diff)
parent5aa88f0e026c004524b88fd8d2be13ab85f17e71 (diff)
downloadCMake-6589f67fb725df68836646ab1e30f496d58f9e36.zip
CMake-6589f67fb725df68836646ab1e30f496d58f9e36.tar.gz
CMake-6589f67fb725df68836646ab1e30f496d58f9e36.tar.bz2
Merge topic 'UseJava-jar-depends'
5aa88f0e02 UseJava: add_jar: rebuild jar on dependencies changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2727
-rw-r--r--Modules/UseJava.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 68c9a27..2bcd28e 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -644,7 +644,7 @@ function(add_jar _TARGET_NAME)
string(APPEND CMAKE_JAVA_INCLUDE_PATH_FINAL "${CMAKE_JAVA_INCLUDE_FLAG_SEP}${_JAVA_JAR_PATH}")
list(APPEND CMAKE_JAVA_INCLUDE_PATH ${_JAVA_JAR_PATH})
list(APPEND _JAVA_DEPENDS ${_JAVA_INCLUDE_JAR})
- list(APPEND _JAVA_COMPILE_DEPENDS ${_JAVA_INCLUDE_JAR})
+ list(APPEND _JAVA_COMPILE_DEPENDS ${_JAVA_JAR_PATH})
else ()
message(SEND_ERROR "add_jar: INCLUDE_JARS target ${_JAVA_INCLUDE_JAR} is not a jar")
endif ()