🐛 Fix bugs after merge, esp. missing headers

cda-tum · Sep 18, 2024 · 1858450 · 1858450
1 parent ccfd6d0
commit 1858450
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/include/na/nalac/NAMapper.hpp b/include/na/nalac/NAMapper.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "../Configuration.hpp"
-#include "Architecture.hpp"
+#include "na/Configuration.hpp"
+#include "na/Architecture.hpp"
 #include "Definitions.hpp"
 #include "ir/QuantumComputation.hpp"
 #include "ir/operations/Operation.hpp"

diff --git a/include/na/nasp/CodeGenerator.hpp b/include/na/nasp/CodeGenerator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "QuantumComputation.hpp"
+#include "ir/QuantumComputation.hpp"
 #include "Solver.hpp"
 #include "na/NAComputation.hpp"
 #include "na/NADefinitions.hpp"

diff --git a/include/na/nasp/Solver.hpp b/include/na/nasp/Solver.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Definitions.hpp"
-#include "yaml-cpp/node/node.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -10,6 +9,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <yaml-cpp/node/node.h>
 #include <z3++.h>
 
 namespace na {

diff --git a/include/na/nasp/SolverFactory.hpp b/include/na/nasp/SolverFactory.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Architecture.hpp"
-#include "QuantumComputation.hpp"
+#include "na/Architecture.hpp"
+#include "ir/QuantumComputation.hpp"
 #include "Solver.hpp"
 #include "na/NADefinitions.hpp"
 

diff --git a/src/na/CMakeLists.txt b/src/na/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(MQT_QMAP_NA_TARGET_NAME ${MQT_QMAP_TARGET_NAME}-na)
 
 if(NOT TARGET ${MQT_QMAP_NA_TARGET_NAME})
-  file(GLOB_RECURSE NA_HEADERS ${MQT_QMAP_INCLUDE_BUILD_DIR}/na/*.hpp)
-  file(GLOB_RECURSE NA_SOURCES *.cpp)
+  file(GLOB NA_HEADERS ${MQT_QMAP_INCLUDE_BUILD_DIR}/na/*.hpp)
+  file(GLOB NA_SOURCES *.cpp)
 
   add_library(${MQT_QMAP_NA_TARGET_NAME} ${NA_HEADERS} ${NA_SOURCES})
 

diff --git a/src/na/nalac/CMakeLists.txt b/src/na/nalac/CMakeLists.txt
@@ -7,7 +7,7 @@ if(NOT TARGET ${MQT_QMAP_NALAC_TARGET_NAME})
   add_library(${MQT_QMAP_NALAC_TARGET_NAME} ${NALAC_HEADERS} ${NALAC_SOURCES})
 
   target_include_directories(${MQT_QMAP_NALAC_TARGET_NAME}
-                             PUBLIC $<BUILD_INTERFACE:${MQT_QMAP_INCLUDE_BUILD_DIR}/na/nalac>)
+                             PUBLIC $<BUILD_INTERFACE:${MQT_QMAP_INCLUDE_BUILD_DIR}>)
 
   target_link_libraries(
     ${MQT_QMAP_NALAC_TARGET_NAME}

diff --git a/src/na/nalac/NAGraphAlgorithms.cpp b/src/na/nalac/NAGraphAlgorithms.cpp
@@ -1,4 +1,4 @@
-#include "NAGraphAlgorithms.hpp"
+#include "na/nalac/NAGraphAlgorithms.hpp"
 
 #include "Definitions.hpp"
 #include "datastructures/DirectedAcyclicGraph.hpp"

diff --git a/src/na/nalac/NAMapper.cpp b/src/na/nalac/NAMapper.cpp
@@ -1,4 +1,4 @@
-#include "na/NAMapper.hpp"
+#include "na/nalac/NAMapper.hpp"
 
 #include "Definitions.hpp"
 #include "datastructures/Layer.hpp"
@@ -9,7 +9,7 @@
 #include "na/Architecture.hpp"
 #include "na/Configuration.hpp"
 #include "na/NADefinitions.hpp"
-#include "na/NAGraphAlgorithms.hpp"
+#include "na/nalac/NAGraphAlgorithms.hpp"
 #include "na/operations/NAGlobalOperation.hpp"
 #include "na/operations/NALocalOperation.hpp"
 #include "na/operations/NAShuttlingOperation.hpp"

diff --git a/src/na/nasp/CMakeLists.txt b/src/na/nasp/CMakeLists.txt
@@ -7,7 +7,7 @@ if(NOT TARGET ${MQT_QMAP_NASP_TARGET_NAME})
   add_library(${MQT_QMAP_NASP_TARGET_NAME} ${NASP_HEADERS} ${NASP_SOURCES})
 
   target_include_directories(${MQT_QMAP_NASP_TARGET_NAME}
-                             PUBLIC $<BUILD_INTERFACE:${MQT_QMAP_INCLUDE_BUILD_DIR}/na/nasp>)
+                             PUBLIC $<BUILD_INTERFACE:${MQT_QMAP_INCLUDE_BUILD_DIR}>)
 
   target_link_libraries(
     ${MQT_QMAP_NASP_TARGET_NAME}

diff --git a/src/na/nasp/CodeGenerator.cpp b/src/na/nasp/CodeGenerator.cpp
@@ -1,15 +1,15 @@
-#include "nasp/CodeGenerator.hpp"
+#include "na/nasp/CodeGenerator.hpp"
 
 #include "Definitions.hpp"
-#include "QuantumComputation.hpp"
+#include "ir/QuantumComputation.hpp"
 #include "datastructures/Layer.hpp"
 #include "na/NAComputation.hpp"
 #include "na/NADefinitions.hpp"
 #include "na/operations/NAGlobalOperation.hpp"
 #include "na/operations/NALocalOperation.hpp"
 #include "na/operations/NAShuttlingOperation.hpp"
-#include "nasp/Solver.hpp"
-#include "operations/OpType.hpp"
+#include "na/nasp/Solver.hpp"
+#include "ir/operations/OpType.hpp"
 
 #include <algorithm>
 #include <cstddef>

diff --git a/src/na/nasp/Solver.cpp b/src/na/nasp/Solver.cpp
@@ -1,4 +1,4 @@
-#include "nasp/Solver.hpp"
+#include "na/nasp/Solver.hpp"
 
 #include "Definitions.hpp"
 

diff --git a/src/na/nasp/SolverFactory.cpp b/src/na/nasp/SolverFactory.cpp
@@ -1,10 +1,10 @@
-#include "SolverFactory.hpp"
+#include "na/nasp/SolverFactory.hpp"
 
-#include "Architecture.hpp"
-#include "QuantumComputation.hpp"
-#include "Solver.hpp"
+#include "na/Architecture.hpp"
+#include "ir/QuantumComputation.hpp"
+#include "na/nasp/Solver.hpp"
 #include "na/NADefinitions.hpp"
-#include "operations/OpType.hpp"
+#include "ir/operations/OpType.hpp"
 
 #include <algorithm>
 #include <cmath>