From 66a4df0667d3432c85c30c61c029fe1cc586e9e7 Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Wed, 24 Mar 2021 13:35:21 +0100
Subject: [PATCH] fairmq-uuid-gen: Move to tools directory

---
 fairmq/CMakeLists.txt                      | 8 ++++++--
 fairmq/FairMQPoller.h                      | 5 +++--
 fairmq/{run => tools}/runUuidGenerator.cxx | 3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename fairmq/{run => tools}/runUuidGenerator.cxx (95%)

diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt
index 905aaeec..93cd9489 100644
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -62,6 +62,7 @@ if(BUILD_FAIRMQ OR BUILD_SDK)
   target_link_libraries(${target}
     PRIVATE
     FairLogger::FairLogger
+    Threads::Threads
     PUBLIC
     Boost::boost
   )
@@ -385,8 +386,11 @@ if(BUILD_FAIRMQ)
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
   )
 
-  add_executable(fairmq-uuid-gen run/runUuidGenerator.cxx)
-  target_link_libraries(fairmq-uuid-gen FairMQ)
+  add_executable(fairmq-uuid-gen tools/runUuidGenerator.cxx)
+  target_link_libraries(fairmq-uuid-gen PUBLIC
+    Boost::program_options
+    Tools
+  )
 
 
   ###########
diff --git a/fairmq/FairMQPoller.h b/fairmq/FairMQPoller.h
index 44bf924a..4438e251 100644
--- a/fairmq/FairMQPoller.h
+++ b/fairmq/FairMQPoller.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,8 +9,9 @@
 #ifndef FAIRMQPOLLER_H_
 #define FAIRMQPOLLER_H_
 
-#include <string>
 #include <memory>
+#include <stdexcept>
+#include <string>
 
 class FairMQPoller
 {
diff --git a/fairmq/run/runUuidGenerator.cxx b/fairmq/tools/runUuidGenerator.cxx
similarity index 95%
rename from fairmq/run/runUuidGenerator.cxx
rename to fairmq/tools/runUuidGenerator.cxx
index a9162fbd..83f95a95 100644
--- a/fairmq/run/runUuidGenerator.cxx
+++ b/fairmq/tools/runUuidGenerator.cxx
@@ -1,10 +1,11 @@
 /********************************************************************************
-*    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+* Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
 *                                                                              *
 *              This software is distributed under the terms of the             *
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
+
 #include <fairmq/tools/Unique.h>
 
 #include <boost/program_options.hpp>