diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-04-30 03:38:58 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-04-30 03:38:58 +0200 |
| commit | ec3d83a73213cc1360ebbd350ec1a1be2018c7af (patch) | |
| tree | c8b7f32e10db81b9aaf78e9f1fa77abb61810af7 | |
| parent | 70e41232d58c0d3a33779bfcb032f76ff42366b5 (diff) | |
kill win32-isms
| -rw-r--r-- | compat/thread-name.cpp | 3 | ||||
| -rw-r--r-- | cv/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/compat/thread-name.cpp b/compat/thread-name.cpp index a89459d1..da9aacd5 100644 --- a/compat/thread-name.cpp +++ b/compat/thread-name.cpp @@ -1,8 +1,5 @@ #include "thread-name.hpp" #ifdef _WIN32 -# ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x0501 -# endif # include <QDebug> # include <windows.h> #else diff --git a/cv/CMakeLists.txt b/cv/CMakeLists.txt index 6c693acb..d5f33d44 100644 --- a/cv/CMakeLists.txt +++ b/cv/CMakeLists.txt @@ -5,10 +5,9 @@ if(OpenCV_FOUND) SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ocv-check.cxx" CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${OpenCV_INCLUDE_DIRS}" "-DCXX_STANDARD=17" "-DCXX_STANDARD_REQUIRED=1" - COMPILE_DEFINITIONS "-D_HAS_EXCEPTIONS=0" OUTPUT_VARIABLE krap) otr_module(cv STATIC) - target_link_libraries(${self} opencv_videoio opencv_core opentrack-video) + target_link_libraries(${self} opencv_core opentrack-video) target_include_directories(${self} SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS}) if(cv_use-ipp) target_compile_definitions(${self} PUBLIC -DOTR_HAS_CV_IPP) |