File tree Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -533,7 +533,12 @@ add_library(mongoc_static STATIC ${SOURCES} ${HEADERS})
533
533
534
534
set (CMAKE_CXX_VISIBILITY_PRESET hidden )
535
535
536
- set (LIBS ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} )
536
+ set (THREADS_PREFER_PTHREAD_FLAG 1 )
537
+ find_package (Threads REQUIRED )
538
+ if (CMAKE_USE_PTHREADS_INIT )
539
+ set (THREAD_LIB ${CMAKE_THREAD_LIBS_INIT} )
540
+ endif ()
541
+ set (LIBS ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} Threads::Threads )
537
542
538
543
target_link_libraries (mongoc_shared ${LIBS} ${BSON_LIBRARIES} )
539
544
target_include_directories (mongoc_shared PUBLIC ${BSON_INCLUDE_DIRS} )
@@ -732,7 +737,7 @@ set(VERSION "${MONGOC_VERSION}")
732
737
set (prefix "${CMAKE_INSTALL_PREFIX} " )
733
738
set (libdir "\$ {prefix}/lib" )
734
739
735
- foreach (FLAG ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} )
740
+ foreach (FLAG ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} ${THREAD_LIB} )
736
741
if ( IS_ABSOLUTE "${FLAG} " )
737
742
get_filename_component (FLAG_DIR "${FLAG} " DIRECTORY )
738
743
get_filename_component (FLAG_FILE "${FLAG} " NAME_WE )
Original file line number Diff line number Diff line change 1
1
EXAMPLE_LDADD = libmongoc-1.0.la
2
+ EXAMPLE_POOL_LDADD =
3
+ EXAMPLE_POOL_CFLAGS =
2
4
if EXPLICIT_LIBS
3
5
EXAMPLE_LDADD += $(BSON_LIBS )
6
+ EXAMPLE_POOL_LDADD += $(PTHREAD_LIBS )
7
+ EXAMPLE_POOL_CFLAGS += $(PTHREAD_CFLAGS )
4
8
endif
5
9
EXAMPLE_CFLAGS = \
6
10
-I$(top_srcdir ) /src/mongoc \
@@ -39,8 +43,8 @@ example_client_LDADD = $(EXAMPLE_LDADD)
39
43
40
44
noinst_PROGRAMS += example-pool
41
45
example_pool_SOURCES = examples/example-pool.c
42
- example_pool_CFLAGS = $(EXAMPLE_CFLAGS )
43
- example_pool_LDADD = $(EXAMPLE_LDADD )
46
+ example_pool_CFLAGS = $(EXAMPLE_CFLAGS ) $( EXAMPLE_POOL_CFLAGS )
47
+ example_pool_LDADD = $(EXAMPLE_LDADD ) $( EXAMPLE_POOL_LDADD )
44
48
45
49
noinst_PROGRAMS += example-command-with-opts
46
50
example_command_with_opts_SOURCES = examples/example-command-with-opts.c
You can’t perform that action at this time.
0 commit comments