From de51c250c476cc2721dfec476bca79eb38ba38b3 Mon Sep 17 00:00:00 2001
From: Dan Guest <dguest@cern.ch>
Date: Mon, 9 Nov 2020 10:42:42 +0100
Subject: [PATCH] Fixes to CMake (Attila requests)
---
Reconstruction/LwtnnUtils/CMakeLists.txt | 6 ++++--
Reconstruction/LwtnnUtils/LwtnnUtils/FastGraph.h | 4 ++--
.../LwtnnUtils/LwtnnUtils/FastInputPreprocessor.h | 4 ++--
Reconstruction/LwtnnUtils/LwtnnUtils/InputOrder.h | 6 +++---
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Reconstruction/LwtnnUtils/CMakeLists.txt b/Reconstruction/LwtnnUtils/CMakeLists.txt
index bbce79e3c3b..a10e47c1630 100644
--- a/Reconstruction/LwtnnUtils/CMakeLists.txt
+++ b/Reconstruction/LwtnnUtils/CMakeLists.txt
@@ -6,12 +6,14 @@ atlas_subdir( LwtnnUtils )
# External dependencies:
find_package( lwtnn )
+find_package( Eigen )
# Build a shared library:
atlas_add_library( LwtnnUtils
+ LwtnnUtils/*.h # <-- for Xcode, not needed otherwise
src/FastGraph.cxx
src/FastInputPreprocessor.cxx
PUBLIC_HEADERS LwtnnUtils
- INCLUDE_DIRS ${LWTNN_INCLUDE_DIRS}
- LINK_LIBRARIES ${LWTNN_LIBRARIES} )
+ INCLUDE_DIRS ${LWTNN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+ LINK_LIBRARIES ${LWTNN_LIBRARIES} ${EIGEN_LIBRARIES} )
diff --git a/Reconstruction/LwtnnUtils/LwtnnUtils/FastGraph.h b/Reconstruction/LwtnnUtils/LwtnnUtils/FastGraph.h
index 4e257f8d9d6..89e26d44d7f 100644
--- a/Reconstruction/LwtnnUtils/LwtnnUtils/FastGraph.h
+++ b/Reconstruction/LwtnnUtils/LwtnnUtils/FastGraph.h
@@ -8,8 +8,8 @@
//
// [1]: https::www.github.com/lwtnn/lwtnn
-#ifndef FAST_GRAPH_H
-#define FAST_GRAPH_H
+#ifndef LWTNN_UTILS_FAST_GRAPH_H
+#define LWTNN_UTILS_FAST_GRAPH_H
#include "lwtnn/lightweight_network_config.hh"
diff --git a/Reconstruction/LwtnnUtils/LwtnnUtils/FastInputPreprocessor.h b/Reconstruction/LwtnnUtils/LwtnnUtils/FastInputPreprocessor.h
index 1f9aa4ba39e..b04688760d6 100644
--- a/Reconstruction/LwtnnUtils/LwtnnUtils/FastInputPreprocessor.h
+++ b/Reconstruction/LwtnnUtils/LwtnnUtils/FastInputPreprocessor.h
@@ -9,8 +9,8 @@
// [1]: https::www.github.com/lwtnn/lwtnn
-#ifndef FAST_INPUT_PREPROCESSOR_HH
-#define FAST_INPUT_PREPROCESSOR_HH
+#ifndef LWTNN_UTILS_FAST_INPUT_PREPROCESSOR_H
+#define LWTNN_UTILS_FAST_INPUT_PREPROCESSOR_H
#include "lwtnn/lightweight_network_config.hh"
#include "lwtnn/Exceptions.hh"
diff --git a/Reconstruction/LwtnnUtils/LwtnnUtils/InputOrder.h b/Reconstruction/LwtnnUtils/LwtnnUtils/InputOrder.h
index 56f8ed097f5..9df4677d991 100644
--- a/Reconstruction/LwtnnUtils/LwtnnUtils/InputOrder.h
+++ b/Reconstruction/LwtnnUtils/LwtnnUtils/InputOrder.h
@@ -8,8 +8,8 @@
//
// [1]: https::www.github.com/lwtnn/lwtnn
-#ifndef INPUT_ORDER_H
-#define INPUT_ORDER_H
+#ifndef LWTNN_UTILS_INPUT_ORDER_H
+#define LWTNN_UTILS_INPUT_ORDER_H
#include <vector>
#include <string>
@@ -33,4 +33,4 @@ namespace lwt::atlas {
}
-#endif // INPUT_ORDER_HH
+#endif
--
GitLab