From 93d8e0a17c119ccc3dffcc1da1a8547b3a0e1687 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 8 Jul 2019 17:06:45 +0200
Subject: [PATCH] [upgrade-db] Adds where to find protobuf libs

And renames tool to cta-upgrade-db in line with other tools
---
 cta.spec.in               | 2 +-
 upgrade_db/CMakeLists.txt | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cta.spec.in b/cta.spec.in
index 085e1e01ea..e022e15dd3 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -288,7 +288,7 @@ Scripts and utilities to faciliate working with the CTA catalogue
 %attr(0755,root,root) %{_bindir}/cta-catalogue-schema-drop
 %attr(0755,root,root) %{_bindir}/cta-catalogue-schema-verify
 %attr(0755,root,root) %{_bindir}/cta-database-poll
-%attr(0755,root,root) %{_bindir}/upgrade-db
+%attr(0755,root,root) %{_bindir}/cta-upgrade-db
 %attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-admin-user-create.1cta.gz
 %attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-schema-create.1cta.gz
 %attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-schema-drop.1cta.gz
diff --git a/upgrade_db/CMakeLists.txt b/upgrade_db/CMakeLists.txt
index 832e360f6e..9f8bc60a69 100644
--- a/upgrade_db/CMakeLists.txt
+++ b/upgrade_db/CMakeLists.txt
@@ -19,7 +19,8 @@ cmake_minimum_required (VERSION 2.6)
 include_directories(${XRD_SSI_PB_DIR}/include ${XROOTD_INCLUDE_DIR} ${XROOTD_INCLUDE_DIR}/private)
 
 # Upgrade DB tool
-add_executable(upgrade-db UpgradeDB.cpp)
-target_link_libraries(upgrade-db ctacatalogue)
+add_executable(cta-upgrade-db UpgradeDB.cpp)
+target_link_libraries(cta-upgrade-db ctacatalogue)
+set_property(TARGET cta-upgrade-db APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
 
-install(TARGETS upgrade-db DESTINATION usr/bin)
+install(TARGETS cta-upgrade-db DESTINATION usr/bin)
-- 
GitLab