From ce0ded43591c8a2e23f5c490e35e514d52468a89 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 29 Jan 2015 14:43:15 +0000
Subject: [PATCH] Task #7432: Moved headers to include/ directory to match
other LCS packages
---
LCS/MessageBus/CMakeLists.txt | 1 +
LCS/MessageBus/include/CMakeLists.txt | 12 ++++++++++++
LCS/MessageBus/{src => include}/MsgBus.h | 0
LCS/MessageBus/src/CMakeLists.txt | 5 -----
LCS/MessageBus/src/MsgBus.cc | 2 +-
5 files changed, 14 insertions(+), 6 deletions(-)
create mode 100644 LCS/MessageBus/include/CMakeLists.txt
rename LCS/MessageBus/{src => include}/MsgBus.h (100%)
diff --git a/LCS/MessageBus/CMakeLists.txt b/LCS/MessageBus/CMakeLists.txt
index 455f009360d..79681fa1c24 100644
--- a/LCS/MessageBus/CMakeLists.txt
+++ b/LCS/MessageBus/CMakeLists.txt
@@ -5,5 +5,6 @@ lofar_package(MessageBus 1.0 DEPENDS Common)
include(LofarFindPackage)
lofar_find_package(QPID)
+add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(test)
diff --git a/LCS/MessageBus/include/CMakeLists.txt b/LCS/MessageBus/include/CMakeLists.txt
new file mode 100644
index 00000000000..0dd022fe577
--- /dev/null
+++ b/LCS/MessageBus/include/CMakeLists.txt
@@ -0,0 +1,12 @@
+# $Id$
+
+# Create symbolic link to include directory.
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+
+# Install header files.
+install(FILES
+ MsgBus.h
+ DESTINATION include/${PACKAGE_NAME})
+
diff --git a/LCS/MessageBus/src/MsgBus.h b/LCS/MessageBus/include/MsgBus.h
similarity index 100%
rename from LCS/MessageBus/src/MsgBus.h
rename to LCS/MessageBus/include/MsgBus.h
diff --git a/LCS/MessageBus/src/CMakeLists.txt b/LCS/MessageBus/src/CMakeLists.txt
index c07e7827587..224c4bb7223 100644
--- a/LCS/MessageBus/src/CMakeLists.txt
+++ b/LCS/MessageBus/src/CMakeLists.txt
@@ -2,11 +2,6 @@
include(LofarPackageVersion)
-# Create symbolic link to include directory.
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
-
set(messagebus_LIB_SRCS
Package__Version.cc
MsgBus.cc)
diff --git a/LCS/MessageBus/src/MsgBus.cc b/LCS/MessageBus/src/MsgBus.cc
index 998b63f1b31..1e33fddb178 100644
--- a/LCS/MessageBus/src/MsgBus.cc
+++ b/LCS/MessageBus/src/MsgBus.cc
@@ -1,4 +1,4 @@
-#include "MsgBus.h"
+#include <MessageBus/MsgBus.h>
using namespace qpid::messaging;
using namespace qpid::types;
--
GitLab