Skip to content

O
opencv
Commit 4a81492b authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #9474 from miqlas:haiku_support

parents d861c033 6258ff36
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
CMakeLists.txt
View file @ 4a81492b
...@@ -544,7 +544,7 @@ if(UNIX) ...@@ -544,7 +544,7 @@ if(UNIX)
CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD) CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD)
if(ANDROID) if(ANDROID)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD") elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD|Haiku")
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
elseif(EMSCRIPTEN) elseif(EMSCRIPTEN)
# no need to link to system libs with emscripten # no need to link to system libs with emscripten
......
modules/core/src/system.cpp
View file @ 4a81492b
...@@ -66,7 +66,7 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex(); ...@@ -66,7 +66,7 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex();
# endif # endif
#endif #endif
#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ #if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ || defined __HAIKU__
# include <unistd.h> # include <unistd.h>
# include <fcntl.h> # include <fcntl.h>
# include <elf.h> # include <elf.h>
...@@ -202,7 +202,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) ...@@ -202,7 +202,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include "omp.h" #include "omp.h"
#endif #endif
#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ #if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __HAIKU__
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment