diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 15:55:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 15:55:03 +0200 |
| commit | 5c32be88a2a854ad561469feb611e51205c376c7 (patch) | |
| tree | 5a79d3bfed05bd2e1347e6056e300b2c028fea9a /searchcore/src/apps | |
| parent | 7b29da0d2943f2aa9e1c6601a538cd4ba0d100be (diff) | |
| parent | 7d665ae3380d013f4b5b8401d8cf239a4e47f51e (diff) | |
Merge branch 'master' into balder/decouple-datatype-and-fiedlvalue-some-more
Diffstat (limited to 'searchcore/src/apps')
| -rw-r--r-- | searchcore/src/apps/fdispatch/.gitignore | 3 | ||||
| -rw-r--r-- | searchcore/src/apps/fdispatch/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/apps/proton/.gitignore | 3 | ||||
| -rw-r--r-- | searchcore/src/apps/proton/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/apps/verify_ranksetup/.gitignore | 3 | ||||
| -rw-r--r-- | searchcore/src/apps/verify_ranksetup/CMakeLists.txt | 2 |
6 files changed, 6 insertions, 9 deletions
diff --git a/searchcore/src/apps/fdispatch/.gitignore b/searchcore/src/apps/fdispatch/.gitignore index 7ef8af69759..6cb8d53bdc1 100644 --- a/searchcore/src/apps/fdispatch/.gitignore +++ b/searchcore/src/apps/fdispatch/.gitignore @@ -1,2 +1 @@ -/fdispatch -fdispatch-bin +vespa-fdispatch-bin diff --git a/searchcore/src/apps/fdispatch/CMakeLists.txt b/searchcore/src/apps/fdispatch/CMakeLists.txt index 728f4e46883..63e1e6ca515 100644 --- a/searchcore/src/apps/fdispatch/CMakeLists.txt +++ b/searchcore/src/apps/fdispatch/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(searchcore_fdispatch_app SOURCES fdispatch.cpp - OUTPUT_NAME fdispatch-bin + OUTPUT_NAME vespa-fdispatch-bin INSTALL sbin DEPENDS searchcore_fdispatch_program diff --git a/searchcore/src/apps/proton/.gitignore b/searchcore/src/apps/proton/.gitignore index 4c244afd919..c2cc445d918 100644 --- a/searchcore/src/apps/proton/.gitignore +++ b/searchcore/src/apps/proton/.gitignore @@ -1,4 +1,3 @@ .depend Makefile -proton -proton-bin +vespa-proton-bin diff --git a/searchcore/src/apps/proton/CMakeLists.txt b/searchcore/src/apps/proton/CMakeLists.txt index 13f04d2d6f4..c5398feed2e 100644 --- a/searchcore/src/apps/proton/CMakeLists.txt +++ b/searchcore/src/apps/proton/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(searchcore_proton_app SOURCES downpersistence.cpp proton.cpp - OUTPUT_NAME proton-bin + OUTPUT_NAME vespa-proton-bin INSTALL sbin DEPENDS searchcore_server diff --git a/searchcore/src/apps/verify_ranksetup/.gitignore b/searchcore/src/apps/verify_ranksetup/.gitignore index 269b313f1f0..d32b68f0f38 100644 --- a/searchcore/src/apps/verify_ranksetup/.gitignore +++ b/searchcore/src/apps/verify_ranksetup/.gitignore @@ -1,4 +1,3 @@ .depend Makefile -verify_ranksetup -verify_ranksetup-bin +vespa-verify-ranksetup-bin diff --git a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt index de777f88182..7dd6d0490da 100644 --- a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt +++ b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(searchcore_verify_ranksetup_app SOURCES verify_ranksetup.cpp - OUTPUT_NAME verify_ranksetup-bin + OUTPUT_NAME vespa-verify-ranksetup-bin INSTALL bin DEPENDS searchcore_fconfig |