Merge pull request #351 from ferdnyc/threading-target

Threads: Use IMPORTED target
This commit is contained in:
Frank Dana
2019-11-01 15:06:17 -04:00
committed by GitHub

View File

@@ -298,6 +298,12 @@ foreach(ff_comp avcodec avdevice avformat avfilter avutil postproc swscale swres
endif()
endforeach()
################### Threads ####################
# Threading library -- uses IMPORTED target Threads::Threads (since CMake 3.1)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
target_link_libraries(openshot PUBLIC Threads::Threads)
################### OPENMP #####################
# Check for OpenMP (used for multi-core processing)
@@ -310,7 +316,6 @@ if(NOT TARGET OpenMP::OpenMP_CXX)
add_library(OpenMP_TARGET INTERFACE)
add_library(OpenMP::OpenMP_CXX ALIAS OpenMP_TARGET)
target_compile_options(OpenMP_TARGET INTERFACE ${OpenMP_CXX_FLAGS})
find_package(Threads REQUIRED)
target_link_libraries(OpenMP_TARGET INTERFACE Threads::Threads)
target_link_libraries(OpenMP_TARGET INTERFACE ${OpenMP_CXX_FLAGS})
endif()