diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-17 19:06:40 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-17 19:06:40 +0200 |
| commit | 7ae03004d8a2eb05c5e12c4ae67e81c63e35b315 (patch) | |
| tree | f0f3d0def6636784705740f7e3809c6e9b1e0245 /install_java.cmake | |
| parent | 5589c5a31ea35668dfa82c0d568626110b58d17d (diff) | |
Checking for files during makefile generation does not work.
Diffstat (limited to 'install_java.cmake')
| -rw-r--r-- | install_java.cmake | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/install_java.cmake b/install_java.cmake index eb9b2bc8f8c..496cf769840 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -1,10 +1,9 @@ function(install_java_artifact NAME) - if (EXISTS "${NAME}/target/${NAME}.jar") - install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) - endif() - if (IS_DIRECTORY "${NAME}/target/dependency") - install(DIRECTORY "${NAME}/target/dependency" DESTINATION lib/jars/ FILES_MATCHING PATTERN "*.jar") - endif() + install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) +endfunction() + +function(install_java_artifact_dependencies NAME) + install(DIRECTORY "${NAME}/target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") endfunction() function(install_fat_java_artifact NAME) @@ -13,8 +12,9 @@ endfunction() install_java_artifact(document) install_java_artifact(jdisc_jetty) +install_java_artifact_dependencies(jdisc_jetty) install_java_artifact(searchlib) -install_java_artifact(vespa_jersey2) +install_java_artifact_dependencies(vespa_jersey2) install_java_artifact(vespajlib) install_fat_java_artifact(application-preprocessor) @@ -24,6 +24,7 @@ install_fat_java_artifact(config-model-api) install_fat_java_artifact(config-model) install_fat_java_artifact(config-provisioning) install_fat_java_artifact(configdefinitions) +install_fat_java_artifact(configserver) install_fat_java_artifact(container-disc) install_fat_java_artifact(container-jersey2) install_fat_java_artifact(container-search-and-docproc) |