Skip to content

Commit f146f5f

Browse files
authored
Merge pull request #351 from ferdnyc/threading-target
Threads: Use IMPORTED target
2 parents 4311b89 + 49c3708 commit f146f5f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,12 @@ foreach(ff_comp avcodec avdevice avformat avfilter avutil postproc swscale swres
298298
endif()
299299
endforeach()
300300

301+
################### Threads ####################
302+
# Threading library -- uses IMPORTED target Threads::Threads (since CMake 3.1)
303+
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
304+
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
305+
find_package(Threads REQUIRED)
306+
target_link_libraries(openshot PUBLIC Threads::Threads)
301307

302308
################### OPENMP #####################
303309
# Check for OpenMP (used for multi-core processing)
@@ -310,7 +316,6 @@ if(NOT TARGET OpenMP::OpenMP_CXX)
310316
add_library(OpenMP_TARGET INTERFACE)
311317
add_library(OpenMP::OpenMP_CXX ALIAS OpenMP_TARGET)
312318
target_compile_options(OpenMP_TARGET INTERFACE ${OpenMP_CXX_FLAGS})
313-
find_package(Threads REQUIRED)
314319
target_link_libraries(OpenMP_TARGET INTERFACE Threads::Threads)
315320
target_link_libraries(OpenMP_TARGET INTERFACE ${OpenMP_CXX_FLAGS})
316321
endif()

0 commit comments

Comments
 (0)