mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: HAVE_LIBPTHREAD, HAVE_PTHREAD(S) => HAVE_PTHREAD

Browse Source
This commit is contained in:
Alexander Alekhin 2017-08-14 10:59:38 +03:00
parent ef2b73043d
commit 6ff9fc67bb
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/protobuf/CMakeLists.txt vendored
View File

@ -2,11 +2,8 @@ project(libprotobuf)
include(CheckIncludeFiles) include(CheckIncludeFiles)
if(NOT MSVC) if(HAVE_PTHREAD)
check_include_files("pthread.h" HAVE_PTHREAD) add_definitions(-DHAVE_PTHREAD=1)
if(HAVE_PTHREAD)
add_definitions(-DHAVE_PTHREAD=1)
endif()
endif() endif()
if(MSVC) if(MSVC)

2
3rdparty/tbb/CMakeLists.txt vendored
View File

@ -67,7 +67,7 @@ else()
) )
endif() endif()
if (HAVE_LIBPTHREAD) if(HAVE_PTHREAD)
add_definitions(-DUSE_PTHREAD) #required for Unix add_definitions(-DUSE_PTHREAD) #required for Unix
endif() endif()

4
CMakeLists.txt
View File

@ -554,7 +554,7 @@ if(UNIX)
include(CheckSymbolExists) include(CheckSymbolExists)
if(NOT APPLE) if(NOT APPLE)
CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD) 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")
@ -565,7 +565,7 @@ if(UNIX)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt)
endif() endif()
else() else()
set(HAVE_LIBPTHREAD YES) set(HAVE_PTHREAD 1)
endif() endif()
CHECK_SYMBOL_EXISTS(posix_memalign stdlib.h HAVE_POSIX_MEMALIGN) CHECK_SYMBOL_EXISTS(posix_memalign stdlib.h HAVE_POSIX_MEMALIGN)

11
cmake/OpenCVFindLibsPerf.cmake
View File

@ -125,16 +125,9 @@ if(WITH_OPENMP)
set(HAVE_OPENMP "${OPENMP_FOUND}") set(HAVE_OPENMP "${OPENMP_FOUND}")
endif() endif()
if(NOT MSVC AND NOT DEFINED HAVE_PTHREADS)
set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/pthread_test.cpp")
file(WRITE "${_fname}" "#include <pthread.h>\nint main() { (void)pthread_self(); return 0; }\n")
try_compile(HAVE_PTHREADS "${CMAKE_BINARY_DIR}" "${_fname}")
file(REMOVE "${_fname}")
endif()
ocv_clear_vars(HAVE_PTHREADS_PF) ocv_clear_vars(HAVE_PTHREADS_PF)
if(WITH_PTHREADS_PF) if(WITH_PTHREADS_PF AND HAVE_PTHREAD)
set(HAVE_PTHREADS_PF ${HAVE_PTHREADS}) set(HAVE_PTHREADS_PF 1)
else() else()
set(HAVE_PTHREADS_PF 0) set(HAVE_PTHREADS_PF 0)
endif() endif()

2
cmake/templates/cvconfig.h.in
View File

@ -154,7 +154,7 @@
#cmakedefine HAVE_PNG #cmakedefine HAVE_PNG
/* Posix threads (pthreads) */ /* Posix threads (pthreads) */
#cmakedefine HAVE_PTHREADS #cmakedefine HAVE_PTHREAD
/* parallel_for with pthreads */ /* parallel_for with pthreads */
#cmakedefine HAVE_PTHREADS_PF #cmakedefine HAVE_PTHREADS_PF