PROTON-405: Allow Java install not to fail if symlink file is missing - This allows the Windows Java Install to succeed - This is a bit nasty as it just hacks our copy of UseJava.cmake
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1640d20d Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1640d20d Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1640d20d Branch: refs/heads/master Commit: 1640d20d9b03e97ff2b23aba00773f5d873f873a Parents: 6c09f1c Author: Andrew Stitcher <[email protected]> Authored: Mon Feb 22 23:22:52 2016 -0500 Committer: Andrew Stitcher <[email protected]> Committed: Tue Feb 23 00:16:16 2016 -0500 ---------------------------------------------------------------------- tools/cmake/Modules/UseJava.cmake | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1640d20d/tools/cmake/Modules/UseJava.cmake ---------------------------------------------------------------------- diff --git a/tools/cmake/Modules/UseJava.cmake b/tools/cmake/Modules/UseJava.cmake index c2afdff..444343e 100644 --- a/tools/cmake/Modules/UseJava.cmake +++ b/tools/cmake/Modules/UseJava.cmake @@ -551,6 +551,7 @@ function(add_jar_from_filelist _TARGET_NAME CMAKE_JAVA_SOURCE_FILE_LIST) endfunction() +# Apache Qpid Proton: make the install files optional so as not to error if there is no symlink function(INSTALL_JAR _TARGET_NAME _DESTINATION) get_property(__FILES TARGET @@ -565,6 +566,7 @@ function(INSTALL_JAR _TARGET_NAME _DESTINATION) ${__FILES} DESTINATION ${_DESTINATION} + OPTIONAL ) else () message(SEND_ERROR "The target ${_TARGET_NAME} is not known in this scope.") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
