Merge pull request #612 from leapmotion/arm-remove-autoboost

arm: remove autoboost headers

CMakeLists.txt

@@ -189,16 +189,16 @@ if(NOT AUTOWIRING_IS_EMBEDDED)
     COMPONENT autowiring
     FILES_MATCHING PATTERN "*.h"
   )
-  
+
   # Install autoboost headers on ARM, which still requires them
-  if(autowiring_BUILD_ARM)
+  if(autowiring_BUILD_ANDROID)
     install(
       DIRECTORY ${PROJECT_SOURCE_DIR}/contrib/autoboost/autoboost
       DESTINATION include
       COMPONENT autowiring
     )
   endif()
-
+ 
   # Targets file is needed in order to describe how to link Autowiring to the rest of the system
   install(EXPORT AutowiringTargets FILE AutowiringTargets.cmake COMPONENT autowiring NAMESPACE Autowiring:: DESTINATION cmake CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
 
@@ -254,4 +254,4 @@ if(NOT AUTOWIRING_IS_EMBEDDED)
   SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "autowiring")
   SET(CPACK_PACKAGE_INSTALL_DIRECTORY "autowiring")
   INCLUDE(CPack)
-endif()
+endif()

src/autowiring/CoreJob.cpp

@@ -6,7 +6,7 @@
 
 // Arm doesn't have std::future, but does have std::chrono. We need to convert from std::chrono
 // to autoboost::chrono when passing arguments to "std::future"(alias to autoboost::future) on arm.
-#if autowiring_BUILD_ARM
+#if autowiring_BUILD_ANDROID
 autoboost::chrono::nanoseconds NanosecondsForFutureWait(const std::chrono::nanoseconds& time) {
   return autoboost::chrono::nanoseconds(time.count());
 }
@@ -136,4 +136,4 @@ bool CoreJob::DoAdditionalWait(std::chrono::nanoseconds timeout) {
   delete ptr;
   m_curEvent = nullptr;
   return status == std::future_status::ready;
-}
+}