Merge pull request #14386 from vespa-engine/hmusum/use-default-config-definitions-dir-if-no-arg

Allow no argument to install_config_definitions

21 files changed, 26 insertions, 21 deletions

diff --git a/chain/CMakeLists.txt b/chain/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/chain/CMakeLists.txt
+++ b/chain/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/config-provisioning/CMakeLists.txt b/config-provisioning/CMakeLists.txt
index ee0bc7f1bae..d46e1bc0215 100644
--- a/config-provisioning/CMakeLists.txt
+++ b/config-provisioning/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(config-provisioning)
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/container-accesslogging/CMakeLists.txt b/container-accesslogging/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/container-accesslogging/CMakeLists.txt
+++ b/container-accesslogging/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt
index de3ef9a517e..74f02518b59 100644
--- a/container-core/CMakeLists.txt
+++ b/container-core/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
 
 vespa_install_script(src/main/sh/vespa-load-balancer-status libexec/vespa)
diff --git a/container-di/CMakeLists.txt b/container-di/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/container-di/CMakeLists.txt
+++ b/container-di/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt
index 3d781a95075..6c63babf66f 100644
--- a/container-disc/CMakeLists.txt
+++ b/container-disc/CMakeLists.txt
@@ -3,4 +3,4 @@ install_fat_java_artifact(container-disc)
 
 vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin)
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/container-messagebus/CMakeLists.txt b/container-messagebus/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/container-messagebus/CMakeLists.txt
+++ b/container-messagebus/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/container-search-and-docproc/CMakeLists.txt b/container-search-and-docproc/CMakeLists.txt
index aef014583f5..a8a374d7feb 100644
--- a/container-search-and-docproc/CMakeLists.txt
+++ b/container-search-and-docproc/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(container-search-and-docproc)
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/container-search/CMakeLists.txt b/container-search/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/container-search/CMakeLists.txt
+++ b/container-search/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/docproc/CMakeLists.txt b/docproc/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/docproc/CMakeLists.txt
+++ b/docproc/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/fileacquirer/CMakeLists.txt b/fileacquirer/CMakeLists.txt
index c05241bf795..0b71d1fc1cd 100644
--- a/fileacquirer/CMakeLists.txt
+++ b/fileacquirer/CMakeLists.txt
@@ -10,4 +10,4 @@ vespa_define_module(
     src/vespa/fileacquirer
 )
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/functions.cmake b/functions.cmake
index 5d23a3cb9ad..bdecc2f5124 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -644,7 +644,12 @@ function(install_config_definition)
 endfunction()
 
 function(install_config_definitions)
-    install(DIRECTORY ${ARGV0}/ DESTINATION share/vespa/configdefinitions FILES_MATCHING PATTERN "*.def")
+    if(ARGC EQUAL 0)
+        set(DEFINITIONS_DIR src/main/resources/configdefinitions)
+    else()
+        set(DEFINITIONS_DIR ${ARGV0})
+    endif()
+    install(DIRECTORY ${DEFINITIONS_DIR}/ DESTINATION share/vespa/configdefinitions FILES_MATCHING PATTERN "*.def")
 endfunction()
 
 function(install_java_artifact NAME)
diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt
index fc39c20dc29..c1ef62a3107 100644
--- a/jdisc-security-filters/CMakeLists.txt
+++ b/jdisc-security-filters/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(jdisc-security-filters)
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/jdisc_http_service/CMakeLists.txt b/jdisc_http_service/CMakeLists.txt
index e0f17286b85..e9e9447bd03 100644
--- a/jdisc_http_service/CMakeLists.txt
+++ b/jdisc_http_service/CMakeLists.txt
@@ -2,4 +2,4 @@
 install_fat_java_artifact(jdisc_http_service)
 install_java_artifact_dependencies(jdisc_http_service)
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/linguistics/CMakeLists.txt b/linguistics/CMakeLists.txt
index f2179625aae..13486b3a551 100644
--- a/linguistics/CMakeLists.txt
+++ b/linguistics/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/metrics-proxy/CMakeLists.txt b/metrics-proxy/CMakeLists.txt
index 20d508c84d3..f6069dd2fe9 100644
--- a/metrics-proxy/CMakeLists.txt
+++ b/metrics-proxy/CMakeLists.txt
@@ -4,4 +4,4 @@ install_fat_java_artifact(metrics-proxy)
 vespa_install_script(src/main/sh/start-telegraf.sh libexec/vespa)
 vespa_install_script(src/main/sh/stop-telegraf.sh libexec/vespa)
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/simplemetrics/CMakeLists.txt b/simplemetrics/CMakeLists.txt
index f593afbfa0c..782e9c7e02a 100644
--- a/simplemetrics/CMakeLists.txt
+++ b/simplemetrics/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(simplemetrics)
 
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/statistics/CMakeLists.txt b/statistics/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/statistics/CMakeLists.txt
+++ b/statistics/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/vespa-osgi-testrunner/CMakeLists.txt b/vespa-osgi-testrunner/CMakeLists.txt
index 13095c213a3..e9c592c81a9 100644
--- a/vespa-osgi-testrunner/CMakeLists.txt
+++ b/vespa-osgi-testrunner/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(vespa-osgi-testrunner)
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/vespa-testrunner-components/CMakeLists.txt b/vespa-testrunner-components/CMakeLists.txt
index 475039cb38e..ff18f8d27c6 100644
--- a/vespa-testrunner-components/CMakeLists.txt
+++ b/vespa-testrunner-components/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_java_artifact(vespa-testrunner-components)
 install_fat_java_artifact(vespa-testrunner-components)
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()
diff --git a/vespaclient-core/CMakeLists.txt b/vespaclient-core/CMakeLists.txt
index 14909bc4ca1..7bb25e6a420 100644
--- a/vespaclient-core/CMakeLists.txt
+++ b/vespaclient-core/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definitions(src/main/resources/configdefinitions)
+install_config_definitions()