From 520a51c62fc958716b867a9138312f8f466cd488 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Mon, 30 Sep 2019 15:20:23 +0200
Subject: hidapi: Fix include path

---
 src/CMakeLists.txt                   | 3 ++-
 src/slic3r/GUI/Mouse3DController.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc1d5e38c..c087e57e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ add_subdirectory(qhull)
 add_subdirectory(Shiny)
 add_subdirectory(semver)
 add_subdirectory(libigl)
-add_subdirectory(hidapi)
 
 # Adding libnest2d project for bin packing...
 set(LIBNEST2D_UNITTESTS ON CACHE BOOL "Force generating unittests for libnest2d")
@@ -24,6 +23,8 @@ add_subdirectory(libslic3r)
 
 if (SLIC3R_GUI)
     add_subdirectory(imgui)
+    add_subdirectory(hidapi)
+    include_directories(hidapi/include)
 
     if(WIN32)
         message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp
index c4b3f78e4..9c7f1ce5e 100644
--- a/src/slic3r/GUI/Mouse3DController.hpp
+++ b/src/slic3r/GUI/Mouse3DController.hpp
@@ -4,7 +4,7 @@
 #if ENABLE_3DCONNEXION_DEVICES
 #include "libslic3r/Point.hpp"
 
-#include "hidapi/hidapi.h"
+#include "hidapi.h"
 
 #include <thread>
 #include <mutex>
-- 
cgit v1.2.3