aboutsummaryrefslogtreecommitdiffstats
path: root/functions.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'functions.cmake')
-rw-r--r--functions.cmake18
1 files changed, 17 insertions, 1 deletions
diff --git a/functions.cmake b/functions.cmake
index f0dd5a31949..1dd5edb6fb2 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -1,5 +1,6 @@
# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
# @author Vegard Sjonfjell
+# @author Arnstein Ressem
function(vespa_add_module_dependency OTHER_TARGET_OR_LIB)
if (TARGET ${OTHER_TARGET_OR_LIB})
@@ -549,9 +550,24 @@ function(install_java_artifact NAME)
endfunction()
function(install_java_artifact_dependencies NAME)
- install(DIRECTORY "target/dependency/" DESTINATION lib/jars FILES_MATCHING PATTERN "*.jar")
+ 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 && ln -sf ${NAME}/*.jar .\")")
endfunction()
function(install_fat_java_artifact NAME)
install(FILES "target/${NAME}-jar-with-dependencies.jar" DESTINATION lib/jars/)
endfunction()
+
+function(install_symlink TARGET LINK)
+ install(CODE "execute_process(COMMAND ln -sf ${CMAKE_INSTALL_PREFIX}/${TARGET} \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${LINK})")
+endfunction(install_symlink)
+
+function(add_auxilliary_modules)
+ if(EXTRA_PROJECTS)
+ foreach(PROJECT ${EXTRA_PROJECTS})
+ get_filename_component(RELDIR ${PROJECT} NAME)
+ add_subdirectory(${PROJECT} ${RELDIR})
+ endforeach()
+ endif()
+endfunction()
+