Move all oskar related files to oskar subdirectory

CMakeLists.txt

@@ -5,6 +5,7 @@ project(lofarbeam)
 add_subdirectory(external)
 
 add_subdirectory(lobes)
+add_subdirectory(oskar)
 
 cmake_policy(SET CMP0074 NEW)
 
@@ -36,8 +37,6 @@ add_library(stationresponse SHARED
   DualDipoleAntenna.cc
   ElementResponseModel.cc
   HamakerElementResponse.cc
-  OSKARElementResponse.cc
-  oskar/oskar_evaluate_dipole_pattern.cc
   ITRFConverter.cc
   ITRFDirection.cc
   LofarMetaDataUtil.cc
@@ -51,6 +50,8 @@ set_target_properties(stationresponse PROPERTIES VERSION 3)
 
 target_link_libraries(stationresponse ${CASACORE_LIBRARIES})
 
+target_link_libraries(stationresponse oskar)
+
 install (TARGETS stationresponse DESTINATION lib)
 
 install (FILES

Station.cc

@@ -24,7 +24,7 @@
 #include "MathUtil.h"
 
 #include "HamakerElementResponse.h"
-#include "OSKARElementResponse.h"
+#include "oskar/OSKARElementResponse.h"
 #include "DualDipoleAntenna.h"
 #include "TileAntenna.h"
 

oskar/CMakeLists.txt

+add_library(oskar SHARED
+    OSKARElementResponse.cc
+    oskar_evaluate_dipole_pattern.cc)

OSKARElementResponse.cc → oskar/OSKARElementResponse.cc

 #include "OSKARElementResponse.h"
 
-#include "oskar/oskar_vector_types.h"
-#include "oskar/oskar_helper.h"
+#include "oskar_vector_types.h"
+#include "oskar_helper.h"
 
 #include <iostream>
 

OSKARElementResponse.h → oskar/OSKARElementResponse.h

-#include "ElementResponse.h"
+#include "../ElementResponse.h"
 
 #include <memory>