Fixed some MSVC and MINGW differences

themarpe · themarpe · commit 5b61e2b9e147 · 2020-06-12T14:00:51.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ HunterGate(
 
 # Move binary dir if windows, to shorten the path
 if(WIN32)
-    set(HUNTER_BINARY_DIR "${HUNTER_GATE_ROOT}/_hunter_bin" CACHE STRING "Hunter binary directory")
+    set(HUNTER_BINARY_DIR "${HUNTER_GATE_ROOT}/_bin" CACHE STRING "Hunter binary directory")
 endif()
 
 # Pybindings project
diff --git a/depthai-core b/depthai-core
@@ -1 +1 @@
-Subproject commit ff7fc269a55d6b9a7d822df3140577b9996a7d1c
+Subproject commit c62bb21c2e2c8f23181621222f1d4f85314e92c7
diff --git a/depthai-cpp/shared/depthai-shared b/depthai-cpp/shared/depthai-shared
@@ -0,0 +1 @@
+Subproject commit 5fa3a40a26508b76823c0b3c14a8cb4ca0f0c091
diff --git a/src/device_bindings.cpp b/src/device_bindings.cpp
@@ -3,16 +3,14 @@
 //std
 #include <iostream>
 
-
 //depthai-core
 #include "depthai/host_capture_command.hpp"
 
 //depthai-shared
 #include "depthai-shared/metadata/capture_metadata.hpp"
 
-
 //project
-#include <pybind11/stl.h>
+#include "pybind11_common.hpp"
 #include <boost/algorithm/string/replace.hpp>
 
 
diff --git a/src/device_bindings.hpp b/src/device_bindings.hpp
@@ -3,9 +3,6 @@
 //pybind11
 #include "pybind11_common.hpp"
 
-#include <pybind11/pybind11.h>
-#include <pybind11/numpy.h>
-
 // depthai-api
 #include "depthai/device.hpp"
 
diff --git a/src/host_data_packet_bindings.cpp b/src/host_data_packet_bindings.cpp
@@ -6,12 +6,12 @@
 //depthai-shared
 #include "depthai-shared/object_tracker/object_tracker.hpp"
 
-// Binding for HostDataPacket
-#include "pybind11/stl.h" // bindings for boost::optional
+// pybind11
+#include "pybind11_common.hpp"
 namespace py = pybind11;
 
+// Binding for HostDataPacket
 PYBIND11_MAKE_OPAQUE(std::list<std::shared_ptr<HostDataPacket>>);
-
 void init_binding_host_data_packet(pybind11::module& m){
     
         
diff --git a/src/host_data_packet_bindings.hpp b/src/host_data_packet_bindings.hpp
@@ -3,9 +3,6 @@
 //pybind11
 #include "pybind11_common.hpp"
 
-#include <pybind11/pybind11.h>
-#include <pybind11/numpy.h>
-
 // depthai-api
 #include "depthai/host_data_packet.hpp"
 
diff --git a/src/nnet_packet_bindings.cpp b/src/nnet_packet_bindings.cpp
@@ -8,7 +8,9 @@
 //project
 #include "host_data_packet_bindings.hpp"
 
-#include "pybind11/stl.h" // bindings for boost::optional
+// pybind11
+#include "pybind11_common.hpp"
+
 namespace py = pybind11;
 
 
diff --git a/src/nnet_packet_bindings.hpp b/src/nnet_packet_bindings.hpp
@@ -3,9 +3,6 @@
 //pybind11
 #include "pybind11_common.hpp"
 
-#include <pybind11/pybind11.h>
-#include <pybind11/numpy.h>
-
 // depthai-api
 #include "depthai/nnet/nnet_packet.hpp"
 
diff --git a/src/py_bindings.cpp b/src/py_bindings.cpp
@@ -6,16 +6,9 @@
 #include <string>
 #include <vector>
 
+// pybind11
 #include "pybind11_common.hpp"
 
-
-#ifdef _MSC_VER 
-    #define HAVE_SNPRINTF
-#endif
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-#include <pybind11/numpy.h>
-
 #include <boost/algorithm/string/replace.hpp>
 
 // depthai-core
diff --git a/src/py_tensor_entry_container_iterator.hpp b/src/py_tensor_entry_container_iterator.hpp
@@ -6,9 +6,6 @@
 // pybind11
 #include "pybind11_common.hpp"
 
-#include <pybind11/pybind11.h>
-
-
 //project
 #include "depthai/nnet/tensor_entry_container.hpp"
 
diff --git a/src/pybind11_common.hpp b/src/pybind11_common.hpp
@@ -1,7 +1,12 @@
 #pragma once
 
+#if (_MSC_VER >= 1910) || !defined(_MSC_VER) 
+    #define HAVE_SNPRINTF
+#endif
+
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <pybind11/numpy.h>
 
 // Recognize boost::optional as valid data type in pybind11
 #define USE_BOOST
@@ -14,6 +19,13 @@ namespace pybind11 { namespace detail {
     struct type_caster<boost::optional<T>> : optional_caster<boost::optional<T>> {};
 }}
 #else
-#include <experimental/optional>
-using std::experimental::optional;
+    #if __cplusplus >= 201703L
+        #include <optional>
+        using std::optional;
+    #elif __cplusplus >= 201402L
+        #include <experimental/optional>
+        using std::experimental::optional;
+    #else
+        #error "Undetected optional binding"
+    #endif
 #endif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 5fa3a40a26508b76823c0b3c14a8cb4ca0f0c091`