diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-05-20 15:16:43 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2022-05-20 15:16:43 +0200 |
| commit | 3cb909475ff27332e3bdc85543286b9b95e2523e (patch) | |
| tree | 71e9263d55ba11ffa68447698fd451d22f3f325f /functions.cmake | |
| parent | a9b7eb4521bbe2123ec221b6f52aa60f7abcc5a6 (diff) | |
install_jar CMake function
Diffstat (limited to 'functions.cmake')
| -rw-r--r-- | functions.cmake | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/functions.cmake b/functions.cmake index 2f0056b3f2a..6dea158c6ae 100644 --- a/functions.cmake +++ b/functions.cmake @@ -655,18 +655,14 @@ function(install_config_definitions) install(DIRECTORY ${DEFINITIONS_DIR}/ DESTINATION share/vespa/configdefinitions FILES_MATCHING PATTERN "*.def") endfunction() -function(install_java_artifact NAME) - install(FILES "target/${NAME}.jar" DESTINATION lib/jars/) +function(install_jar FILENAME) + install(FILES "target/${FILENAME}" DESTINATION lib/jars/) endfunction() -function(install_java_artifact_dependencies NAME) +function(install_jar_dependencies NAME) install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar") endfunction() -function(install_fat_java_artifact NAME) - install(FILES "target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/) -endfunction() - function(install_absolute_symlink TARGET LINK) install(CODE "execute_process(COMMAND ln -snf ${TARGET} \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LINK})") endfunction(install_absolute_symlink) @@ -686,9 +682,8 @@ function(install_configserver_component NAME) if(NOT PARAM_CLASSIFIER) SET(PARAM_CLASSIFIER "jar-with-dependencies") endif() - install(FILES "target/${NAME}-${PARAM_CLASSIFIER}.jar" DESTINATION lib/jars/) - install(DIRECTORY DESTINATION conf/configserver-app/components) - install_symlink(lib/jars/${NAME}-${PARAM_CLASSIFIER}.jar conf/configserver-app/components/${NAME}.jar) + install_jar("target/${NAME}-${PARAM_CLASSIFIER}.jar") + install_app_component_symlink(configserver-app "${NAME}" CLASSIFIER "${PARAM_CLASSIFIER}") endfunction() function(install_app_component_symlink APPNAME NAME) |