From 2014be22cc245c72db546ae330c43adb5abdb8a5 Mon Sep 17 00:00:00 2001
From: Tobias Hieta <tobias@plexapp.com>
Date: Tue, 22 Mar 2016 11:19:45 +0100
Subject: [PATCH] Move HIDRemote to external so it won't be tidied

---
 CMakeModules/AppleConfiguration.cmake               | 2 +-
 external/CMakeLists.txt                             | 1 +
 external/HIDRemote/CMakeLists.txt                   | 2 ++
 {src/input/apple => external}/HIDRemote/HIDRemote.h | 0
 {src/input/apple => external}/HIDRemote/HIDRemote.m | 0
 {src/input/apple => external}/HIDRemote/LICENSE.txt | 0
 {src/input/apple => external}/HIDRemote/README.txt  | 0
 src/CMakeLists.txt                                  | 3 ++-
 src/input/apple/AppleRemoteDelegate.h               | 4 ++--
 src/input/apple/CMakeLists.txt                      | 1 -
 src/input/apple/InputAppleRemote.mm                 | 2 +-
 11 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 external/HIDRemote/CMakeLists.txt
 rename {src/input/apple => external}/HIDRemote/HIDRemote.h (100%)
 rename {src/input/apple => external}/HIDRemote/HIDRemote.m (100%)
 rename {src/input/apple => external}/HIDRemote/LICENSE.txt (100%)
 rename {src/input/apple => external}/HIDRemote/README.txt (100%)

diff --git a/CMakeModules/AppleConfiguration.cmake b/CMakeModules/AppleConfiguration.cmake
index 05890c1..914053d 100644
--- a/CMakeModules/AppleConfiguration.cmake
+++ b/CMakeModules/AppleConfiguration.cmake
@@ -5,7 +5,7 @@ find_library(COCOA Cocoa)
 find_Library(CARBON Carbon)
 find_library(SECURITY Security)
 
-set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} spmediakeytap)
+set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} spmediakeytap hidremote)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.9 -fno-omit-frame-pointer")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.9 -fno-omit-frame-pointer")
 set(WARNINGS "-Wall")
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 072305b..29a4300 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -4,4 +4,5 @@ add_subdirectory(qhttp)
 if(APPLE)
   add_subdirectory(plistparser)
   add_subdirectory(SPMediaKeyTap)
+  add_subdirectory(HIDRemote)
 endif(APPLE)
diff --git a/external/HIDRemote/CMakeLists.txt b/external/HIDRemote/CMakeLists.txt
new file mode 100644
index 0000000..1cffeb1
--- /dev/null
+++ b/external/HIDRemote/CMakeLists.txt
@@ -0,0 +1,2 @@
+set_source_files_properties(HIDRemote.m PROPERTIES COMPILE_FLAGS -fno-objc-arc)
+add_library(hidremote STATIC HIDRemote.m HIDRemote.h)
diff --git a/src/input/apple/HIDRemote/HIDRemote.h b/external/HIDRemote/HIDRemote.h
similarity index 100%
rename from src/input/apple/HIDRemote/HIDRemote.h
rename to external/HIDRemote/HIDRemote.h
diff --git a/src/input/apple/HIDRemote/HIDRemote.m b/external/HIDRemote/HIDRemote.m
similarity index 100%
rename from src/input/apple/HIDRemote/HIDRemote.m
rename to external/HIDRemote/HIDRemote.m
diff --git a/src/input/apple/HIDRemote/LICENSE.txt b/external/HIDRemote/LICENSE.txt
similarity index 100%
rename from src/input/apple/HIDRemote/LICENSE.txt
rename to external/HIDRemote/LICENSE.txt
diff --git a/src/input/apple/HIDRemote/README.txt b/external/HIDRemote/README.txt
similarity index 100%
rename from src/input/apple/HIDRemote/README.txt
rename to external/HIDRemote/README.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c8140aa..ef4ec2d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/external/qhttp/src
   ${CMAKE_SOURCE_DIR}/external/qslog
   ${CMAKE_SOURCE_DIR}/external/SPMediaKeyTap
+  ${CMAKE_SOURCE_DIR}/external/HIDRemote
   ${CMAKE_SOURCE_DIR}/external/plistparser
   ${CMAKE_SOURCE_DIR}/src/player
   shared
@@ -110,7 +111,7 @@ if(APPLE)
   endif(HAVE_UPDATER)
 
   set_source_files_properties(
-    input/apple/HIDRemote/HIDRemote.h
+    /HIDRemote/HIDRemote.h
     input/apple/HIDRemote/HIDRemote.m
     PROPERTIES COMPILE_FLAGS -fno-objc-arc
   )
diff --git a/src/input/apple/AppleRemoteDelegate.h b/src/input/apple/AppleRemoteDelegate.h
index 71c5699..5700a99 100644
--- a/src/input/apple/AppleRemoteDelegate.h
+++ b/src/input/apple/AppleRemoteDelegate.h
@@ -2,7 +2,7 @@
 #define __APPLE_REMOTE_DELEGATE_H__
 
 #import <Cocoa/Cocoa.h>
-#import "HIDRemote/HIDRemote.h"
+#import "HIDRemote.h"
 
 class InputAppleRemote;
 
@@ -26,4 +26,4 @@ fromHardwareWithAttributes:(NSMutableDictionary *)attributes;
 
 @end
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/input/apple/CMakeLists.txt b/src/input/apple/CMakeLists.txt
index e62e134..34eeff8 100644
--- a/src/input/apple/CMakeLists.txt
+++ b/src/input/apple/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(APPLE_SRC
-    HIDRemote/HIDRemote.h HIDRemote/HIDRemote.m
     InputAppleRemote.h InputAppleRemote.mm
     AppleRemoteDelegate.mm AppleRemoteDelegate.h
     InputAppleMediaKeys.h InputAppleMediaKeys.mm
diff --git a/src/input/apple/InputAppleRemote.mm b/src/input/apple/InputAppleRemote.mm
index c696e2e..313c5b4 100644
--- a/src/input/apple/InputAppleRemote.mm
+++ b/src/input/apple/InputAppleRemote.mm
@@ -1,7 +1,7 @@
 #include "InputAppleRemote.h"
 #include "QsLog.h"
 
-#include "HIDRemote/HIDRemote.h"
+#include "HIDRemote.h"
 #include "AppleRemoteDelegate.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////