Skip to content

Commit 6c73a07

Browse files
committed
try to fix thread detection
1 parent 329f3ec commit 6c73a07

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ find_package(Git)
4141
# webrtc build
4242
set (WEBRTCBUILD ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE})
4343
set (WEBRTCOBJS ${WEBRTCBUILD}/obj)
44-
4544
if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX})
4645
if(GIT_FOUND)
4746
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src COMMAND ${GIT_EXECUTABLE} status)
@@ -269,6 +268,9 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE cxxopts/include)
269268
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE CXXOPTS_NO_RTTI)
270269

271270
# thread
271+
if (NOT WIN32)
272+
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
273+
endif()
272274
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
273275
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
274276
find_package (Threads)
@@ -370,12 +372,12 @@ target_include_directories(civetweb PUBLIC civetweb/include)
370372
find_package(PkgConfig QUIET)
371373
pkg_check_modules(RTMP QUIET librtmp)
372374
MESSAGE("RTMP_FOUND = ${RTMP_FOUND} RTMP_INCLUDE_DIRS=${RTMP_INCLUDE_DIRS} RTMP_LIBRARY_DIRS=${RTMP_LIBRARY_DIRS} RTMP_LIBRARIES=${RTMP_LIBRARIES}")
373-
if (RTMP_FOUND)
375+
find_library(RTMP_LIB QUIET rtmp)
376+
MESSAGE("RTMP_LIB=${RTMP_LIB}")
377+
if (RTMP_FOUND AND RTMP_LIB_FOUND)
374378
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_RTMP)
375379
target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC ${RTMP_INCLUDE_DIRS})
376380
target_link_directories(${CMAKE_PROJECT_NAME} PUBLIC ${RTMP_LIBRARY_DIRS})
377-
find_library(RTMP_LIB rtmp)
378-
MESSAGE("RTMP_LIB=${RTMP_LIB}")
379381
target_link_libraries (${CMAKE_PROJECT_NAME} ${RTMP_LIB})
380382
endif()
381383

0 commit comments

Comments
 (0)