diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2019-11-18 14:37:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 14:37:03 +0100 |
| commit | 00f8dac6f1f0f3e2fc0b6d0c6e18a83f3a572694 (patch) | |
| tree | ed7a61f5e9de90a9f2130fdc5411b34493be39ec | |
| parent | 271796794967b10d006e7505d4962f5ab7487051 (diff) | |
| parent | df31a37007b171d202d5066a87bf4f7c973df499 (diff) | |
Merge pull request #11339 from vespa-engine/toregge/install-java-artifact-dependencies-directly-to-lib-jars-directory
Install java artifact dependencies directly to lib/jars directory.
| -rw-r--r-- | functions.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/functions.cmake b/functions.cmake index a049276d845..3212ea04a65 100644 --- a/functions.cmake +++ b/functions.cmake @@ -550,8 +550,7 @@ function(install_java_artifact NAME) endfunction() function(install_java_artifact_dependencies NAME) - install(DIRECTORY "target/dependency/" DESTINATION lib/jars/${NAME} FILES_MATCHING PATTERN "*.jar") - install(CODE "execute_process(COMMAND bash -c \"cd \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib/jars && if [ -d ${NAME} ]; then ln -sf ${NAME}/*.jar . ; fi\")") + install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") endfunction() function(install_fat_java_artifact NAME) |