diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | client/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | client/go/.gitignore | 1 | ||||
| -rw-r--r-- | client/go/Makefile | 3 | ||||
| -rw-r--r-- | vespalog/CMakeLists.txt | 1 |
5 files changed, 18 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fbc756236d..9290b2da189 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ add_subdirectory(ann_benchmark) add_subdirectory(application-model) add_subdirectory(application-preprocessor) add_subdirectory(athenz-identity-provider-service) +add_subdirectory(client) add_subdirectory(config-bundle) add_subdirectory(config-model) add_subdirectory(config-model-api) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt new file mode 100644 index 00000000000..1ca6d2b4e60 --- /dev/null +++ b/client/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +set(GODIR ${CMAKE_CURRENT_SOURCE_DIR}/go) + +file(GLOB_RECURSE GOSRCFILES ${GODIR}/*.go) + +add_custom_command(OUTPUT ${GODIR}/bin/vespa-logfmt + COMMAND make + DEPENDS ${GODIR}/Makefile ${GOSRCFILES} + WORKING_DIRECTORY ${GODIR}) + +add_custom_target(vespalog_logfmt ALL DEPENDS ${GODIR}/bin/vespa-logfmt) + +install(PROGRAMS ${GODIR}/bin/vespa-logfmt DESTINATION bin) diff --git a/client/go/.gitignore b/client/go/.gitignore index 8933bc220cb..baab7c638c6 100644 --- a/client/go/.gitignore +++ b/client/go/.gitignore @@ -6,3 +6,4 @@ share/ !target/ mytestapp/ mytestapp-cache/ +mytmp/ diff --git a/client/go/Makefile b/client/go/Makefile index 78adf299f0e..8a07f880c24 100644 --- a/client/go/Makefile +++ b/client/go/Makefile @@ -131,7 +131,8 @@ clean: rmdir -p $(BIN) $(SHARE)/man/man1 > /dev/null 2>&1 || true test: ci - go test ./... + mkdir -p mytmp + TMPDIR=`pwd`/mytmp go test ./... checkfmt: @bash -c "diff --line-format='%L' <(echo -n) <(gofmt -l .)" || { echo "one or more files need to be formatted: try make fmt to fix this automatically"; exit 1; } diff --git a/vespalog/CMakeLists.txt b/vespalog/CMakeLists.txt index 45410a1d29d..cc419681445 100644 --- a/vespalog/CMakeLists.txt +++ b/vespalog/CMakeLists.txt @@ -17,6 +17,5 @@ vespa_define_module( src/test/threads ) -vespa_install_script(src/vespa-logfmt/vespa-logfmt.pl vespa-logfmt bin) install(FILES src/vespa-logfmt/vespa-logfmt.1 DESTINATION man/man1) install(DIRECTORY DESTINATION var/db/vespa/logcontrol) |