From 25e75bcc7938f04203330501cc05c8048c7b7ec8 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Thu, 30 Jul 2015 18:11:24 -0700
Subject: [PATCH] WIP: trying to fix windows not finding framework

---
 cmake/modules/Find3DConnexionClient.cmake   | 5 ++---
 interface/src/devices/3DConnexionClient.cpp | 2 +-
 interface/src/devices/3DConnexionClient.h   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/Find3DConnexionClient.cmake b/cmake/modules/Find3DConnexionClient.cmake
index 522c25478e..ffd6477ae4 100644
--- a/cmake/modules/Find3DConnexionClient.cmake
+++ b/cmake/modules/Find3DConnexionClient.cmake
@@ -28,9 +28,8 @@ if (APPLE)
   else ()
     message(STATUS "Could NOT find 3DConnexionClient")
   endif()
-endif()
-
-if (WIN32)
+elseif (WIN32)
+  message(STATUS ${CONNEXIONCLIENT_SEARCH_DIRS})
   find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES Inc HINTS ${CONNEXIONCLIENT_SEARCH_DIRS})
 
   include(FindPackageHandleStandardArgs)
diff --git a/interface/src/devices/3DConnexionClient.cpp b/interface/src/devices/3DConnexionClient.cpp
index 2e0a30715c..00a570f66c 100755
--- a/interface/src/devices/3DConnexionClient.cpp
+++ b/interface/src/devices/3DConnexionClient.cpp
@@ -158,7 +158,7 @@ ConnexionClient& ConnexionClient::getInstance() {
 
 #ifdef HAVE_3DCONNEXIONCLIENT
 
-#ifdef _WIN32
+#ifdef Q_OS_WIN
 
 static ConnexionClient* gMouseInput = 0;
 
diff --git a/interface/src/devices/3DConnexionClient.h b/interface/src/devices/3DConnexionClient.h
index 454c89f797..ea9aa7456f 100755
--- a/interface/src/devices/3DConnexionClient.h
+++ b/interface/src/devices/3DConnexionClient.h
@@ -33,7 +33,7 @@ public slots:
 
 #ifdef HAVE_3DCONNEXIONCLIENT
 // the windows connexion rawinput
-#ifdef _WIN32
+#ifdef Q_OS_WIN
 
 #include "I3dMouseParams.h"
 #include <QAbstractNativeEventFilter>