SW-835: Fix compilation of outputProc after moving CommonLofarAttributes

RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.cc

@@ -20,7 +20,6 @@
 
 #include <lofar_config.h>
 
-#ifdef HAVE_DAL
 #include "CommonLofarAttributes.h"
 
 #include <ctime>
@@ -67,6 +66,7 @@ namespace LOFAR
       return 0.5 * subbandWidth / nrChannels;
     }
 
+#ifdef HAVE_DAL
     void writeCommonLofarAttributes(dal::CLA_File& file, const Parset& parset)
     {
       file.groupType().value = "Root";
@@ -182,7 +182,7 @@ namespace LOFAR
       file.notes().value = "";
     }
 
+#endif // HAVE_DAL
   }
 }
 
-#endif // HAVE_DAL

RTCP/Cobalt/CoInterface/src/CommonLofarAttributes.h

@@ -24,7 +24,10 @@
 #include <string>
 #include <vector>
 #include <CoInterface/Parset.h>
+
+#ifdef HAVE_DAL
 #include <dal/lofar/CLA_File.h>
+#endif
 
 namespace LOFAR
 {
@@ -35,8 +38,10 @@ namespace LOFAR
 
     double      getFrequencyOffsetPPF(double subbandWidth, unsigned nrChannels);
 
+#ifdef HAVE_DAL
     void        writeCommonLofarAttributes(dal::CLA_File& file,
                                            const Parset& parset);
+#endif
   }
 }
 

RTCP/Cobalt/OutputProc/src/CMakeLists.txt

@@ -18,7 +18,6 @@ lofar_add_library(outputproc
   MSWriterNull.cc
   MSWriterFile.cc
   MeasurementSetFormat.cc
-  CommonLofarAttributes.cc
   OutputThread.cc
   SubbandWriter.cc
   RSPRawWriter.cc

RTCP/Cobalt/OutputProc/src/MSWriterDAL.cc

@@ -40,7 +40,7 @@
 #include <CoInterface/StreamableData.h>
 #include <CoInterface/LTAFeedback.h>
 #include <CoInterface/SmartPtr.h>
-#include <OutputProc/CommonLofarAttributes.h>
+#include <CoInterface/CommonLofarAttributes.h>
 #include <OutputProc/Package__Version.h>
 
 #include <dal/lofar/BF_File.h>