From 738881099f61bf901c859ce5e9b1bd24f8661b12 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 14 Aug 2015 08:01:59 -0700
Subject: [PATCH] Unbreak cmake build.

Several ctre headers were in source directories but were required by other
headers in include directories.  This worked in gradle but not in cmake.

Change-Id: I806c76031b396d1694a18b8e30c705e92f617a66
---
 hal/{lib/Athena => include}/ctre/CtreCanNode.h | 1 -
 hal/{lib/Athena => include}/ctre/PCM.h         | 1 -
 hal/{lib/Athena => include}/ctre/PDP.h         | 1 -
 hal/{lib/Athena => include}/ctre/ctre.h        | 0
 hal/lib/Athena/ctre/CtreCanNode.cpp            | 2 +-
 hal/lib/Athena/ctre/PCM.cpp                    | 2 +-
 hal/lib/Athena/ctre/PDP.cpp                    | 2 +-
 7 files changed, 3 insertions(+), 6 deletions(-)
 rename hal/{lib/Athena => include}/ctre/CtreCanNode.h (92%)
 rename hal/{lib/Athena => include}/ctre/PCM.h (96%)
 rename hal/{lib/Athena => include}/ctre/PDP.h (93%)
 rename hal/{lib/Athena => include}/ctre/ctre.h (100%)

diff --git a/hal/lib/Athena/ctre/CtreCanNode.h b/hal/include/ctre/CtreCanNode.h
similarity index 92%
rename from hal/lib/Athena/ctre/CtreCanNode.h
rename to hal/include/ctre/CtreCanNode.h
index 70ce567e05..4af7307c4b 100644
--- a/hal/lib/Athena/ctre/CtreCanNode.h
+++ b/hal/include/ctre/CtreCanNode.h
@@ -1,7 +1,6 @@
 #ifndef CtreCanNode_H_
 #define CtreCanNode_H_
 #include "ctre.h"				//BIT Defines + Typedefs
-#include <NetworkCommunication/CANSessionMux.h>	//CAN Comm
 #include <map>
 #include <string.h> // memcpy
 #include <sys/time.h>
diff --git a/hal/lib/Athena/ctre/PCM.h b/hal/include/ctre/PCM.h
similarity index 96%
rename from hal/lib/Athena/ctre/PCM.h
rename to hal/include/ctre/PCM.h
index a3c61ef30f..6ae3eb182b 100644
--- a/hal/lib/Athena/ctre/PCM.h
+++ b/hal/include/ctre/PCM.h
@@ -1,7 +1,6 @@
 #ifndef PCM_H_
 #define PCM_H_
 #include "ctre.h"				//BIT Defines + Typedefs
-#include <NetworkCommunication/CANSessionMux.h>	//CAN Comm
 #include "CtreCanNode.h"
 class PCM : public CtreCanNode
 {
diff --git a/hal/lib/Athena/ctre/PDP.h b/hal/include/ctre/PDP.h
similarity index 93%
rename from hal/lib/Athena/ctre/PDP.h
rename to hal/include/ctre/PDP.h
index 42b62a299e..b968a4439e 100644
--- a/hal/lib/Athena/ctre/PDP.h
+++ b/hal/include/ctre/PDP.h
@@ -1,7 +1,6 @@
 #ifndef PDP_H_
 #define PDP_H_
 #include "ctre.h"				//BIT Defines + Typedefs
-#include <NetworkCommunication/CANSessionMux.h>	//CAN Comm
 #include "CtreCanNode.h"
 class PDP : public CtreCanNode
 {
diff --git a/hal/lib/Athena/ctre/ctre.h b/hal/include/ctre/ctre.h
similarity index 100%
rename from hal/lib/Athena/ctre/ctre.h
rename to hal/include/ctre/ctre.h
diff --git a/hal/lib/Athena/ctre/CtreCanNode.cpp b/hal/lib/Athena/ctre/CtreCanNode.cpp
index b2e3620284..b25b599d57 100644
--- a/hal/lib/Athena/ctre/CtreCanNode.cpp
+++ b/hal/lib/Athena/ctre/CtreCanNode.cpp
@@ -1,6 +1,6 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
-#include "CtreCanNode.h"
+#include "ctre/CtreCanNode.h"
 #include "NetworkCommunication/CANSessionMux.h"
 #include <string.h> // memset
 #include <unistd.h> // usleep
diff --git a/hal/lib/Athena/ctre/PCM.cpp b/hal/lib/Athena/ctre/PCM.cpp
index 92f2284a9f..39ed798232 100644
--- a/hal/lib/Athena/ctre/PCM.cpp
+++ b/hal/lib/Athena/ctre/PCM.cpp
@@ -1,6 +1,6 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
-#include "PCM.h"
+#include "ctre/PCM.h"
 #include "NetworkCommunication/CANSessionMux.h"
 #include <string.h> // memset
 #include <unistd.h> // usleep
diff --git a/hal/lib/Athena/ctre/PDP.cpp b/hal/lib/Athena/ctre/PDP.cpp
index 5cda11e98c..c1f2c0471e 100644
--- a/hal/lib/Athena/ctre/PDP.cpp
+++ b/hal/lib/Athena/ctre/PDP.cpp
@@ -1,4 +1,4 @@
-#include "PDP.h"
+#include "ctre/PDP.h"
 #include "NetworkCommunication/CANSessionMux.h"	//CAN Comm
 #include <string.h> // memset
 #include <unistd.h> // usleep