Fixed paths for 3Dconnexion headers on Mac

FreeCAD · Dec 19, 2015 · bdc5197 · bdc5197
1 parent 5b750aa
commit bdc5197
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -12,7 +12,8 @@ if (FREECAD_USE_3DCONNEXION)
     add_definitions(-D_USE_3DCONNEXION_SDK)
     if(APPLE)
         set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient")
-        set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers )
+        set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers
+                                    ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers/3DconnexionClient )
     endif(APPLE)
 endif(FREECAD_USE_3DCONNEXION)
 

diff --git a/src/Gui/GuiApplicationNativeEventAware.h b/src/Gui/GuiApplicationNativeEventAware.h
@@ -45,7 +45,7 @@ class QMainWindow;
 
 #ifdef Q_WS_MACX
 #include <IOKit/IOKitLib.h>
-#include <3DconnexionClient/ConnexionClientAPI.h>
+#include <ConnexionClientAPI.h>
 extern OSErr InstallConnexionHandlers(ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler)
   __attribute__((weak_import));
 extern UInt16 RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) __attribute__((weak_import));