From 159a61eba7d1f0173a76e9f3a6f44d9b1444e70a Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Wed, 23 Mar 2016 14:56:41 +0000
Subject: [PATCH] Task #8900: use cmake to deploy sql scripts in share
---
.gitattributes | 1 +
SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt | 2 +-
SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt | 3 +--
SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt | 4 ++++
4 files changed, 7 insertions(+), 3 deletions(-)
create mode 100644 SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt
diff --git a/.gitattributes b/.gitattributes
index 1ba4ea1f776..5aacba21355 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4973,6 +4973,7 @@ SAS/ResourceAssignment/QPIDInfrastructure/lib/CMakeLists.txt -text
SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py -text
SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py -text
SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py -text
+SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt -text
SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql -text
SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt -text
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt b/SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt
index 4acd944f395..741a619e355 100644
--- a/SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt
+++ b/SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt
@@ -6,5 +6,5 @@ include(PythonInstall)
add_subdirectory(lib)
add_subdirectory(bin)
-# add_subdirectory(sql)
+add_subdirectory(sql)
# add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt b/SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt
index a1b4f773935..6444ec60bbd 100644
--- a/SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt
@@ -2,10 +2,9 @@
lofar_add_bin_scripts(addtoQPIDDB.py
cep4_config.sh
- CMakeLists.txt
compareQPIDwithDB.py
configQPIDfromDB.py
gatherfrombrokers.sh
- # qpidinfra_dump.sql
route_to_struct.py)
+install_files(/share/qpidinfrastructure/sql qpidinfra_dump.sql)
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt b/SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt
new file mode 100644
index 00000000000..92af7c13c0d
--- /dev/null
+++ b/SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt
@@ -0,0 +1,4 @@
+# $Id: CMakeLists.txt 32341 2015-08-28 11:59:26Z schaap $
+
+install_files(/share/qpidinfrastructure/sql qpidinfradb.sql)
+
--
GitLab