Build fix

Made sure both LLVM and Subzero has the /src directory in their include directory list. Removed unused ../ in front of "Common" includes as a cleanup. Change-Id: Ib4a6fb772fa03a9a3cad82594db1b1650007e47f Reviewed-on: https://swiftshader-review.googlesource.com/20728Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Alexis Hétu <sugoi@google.com>

Build fix
25c541e5 · Alexis Hetu · Alexis Hétu · a764381e · 25c541e5 · 25c541e5
Commit 25c541e5 authored Sep 14, 2018 by Alexis Hetu Committed by Alexis Hétu Sep 14, 2018
Showing with 8 additions and 7 deletions

CMakeLists.txt CMakeLists.txt +1 -0

LLVMRoutine.cpp src/Reactor/LLVMRoutine.cpp +3 -3

LLVMRoutineManager.cpp src/Reactor/LLVMRoutineManager.cpp +3 -3

Routine.cpp src/Reactor/Routine.cpp +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1721,6 +1721,7 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero")
    )
    set(SUBZERO_INCLUDE_DIR
+        ${SOURCE_DIR}/
        ${SUBZERO_DIR}/
        ${SUBZERO_LLVM_DIR}/include/
        ${SUBZERO_DIR}/pnacl-llvm/include/

--- a/src/Reactor/LLVMRoutine.cpp
+++ b/src/Reactor/LLVMRoutine.cpp
@@ -14,9 +14,9 @@
 #include "LLVMRoutine.hpp"
-#include "../Common/Memory.hpp"
+#include "Common/Memory.hpp"
-#include "../Common/Thread.hpp"
+#include "Common/Thread.hpp"
-#include "../Common/Types.hpp"
+#include "Common/Types.hpp"
 namespace sw
 {

--- a/src/Reactor/LLVMRoutineManager.cpp
+++ b/src/Reactor/LLVMRoutineManager.cpp
@@ -18,9 +18,9 @@
 #include "LLVMRoutine.hpp"
 #include "llvm/Function.h"
-#include "../Common/Memory.hpp"
+#include "Common/Memory.hpp"
-#include "../Common/Thread.hpp"
+#include "Common/Thread.hpp"
-#include "../Common/Debug.hpp"
+#include "Common/Debug.hpp"
 namespace sw
 {

--- a/src/Reactor/Routine.cpp
+++ b/src/Reactor/Routine.cpp
@@ -14,7 +14,7 @@
 #include "Routine.hpp"
-#include "../Common/Thread.hpp"
+#include "Common/Thread.hpp"
 #include <cassert>