diff options
| -rw-r--r-- | client/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config-model/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 1ca6d2b4e60..56c6cacc526 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -4,11 +4,13 @@ set(GODIR ${CMAKE_CURRENT_SOURCE_DIR}/go) file(GLOB_RECURSE GOSRCFILES ${GODIR}/*.go) -add_custom_command(OUTPUT ${GODIR}/bin/vespa-logfmt +add_custom_command(OUTPUT ${GODIR}/bin/vespa-logfmt ${GODIR}/bin/vespa-deploy COMMAND make DEPENDS ${GODIR}/Makefile ${GOSRCFILES} WORKING_DIRECTORY ${GODIR}) add_custom_target(vespalog_logfmt ALL DEPENDS ${GODIR}/bin/vespa-logfmt) +add_custom_target(vespalog_deploy ALL DEPENDS ${GODIR}/bin/vespa-deploy) install(PROGRAMS ${GODIR}/bin/vespa-logfmt DESTINATION bin) +install(PROGRAMS ${GODIR}/bin/vespa-deploy DESTINATION bin) diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt index 834830587d1..0d9a05160d9 100644 --- a/config-model/CMakeLists.txt +++ b/config-model/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_jar(config-model-jar-with-dependencies.jar) -vespa_install_script(src/main/perl/vespa-deploy bin) - install(DIRECTORY src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE PATTERN "version" EXCLUDE) install(DIRECTORY src/main/resources/schema DESTINATION share/vespa/schema/version/8.x PATTERN ".gitignore" EXCLUDE PATTERN "version" EXCLUDE) # TODO: Remove when Vespa > 8 and no apps are left on 7 in hosted Vespa |