Skip to content

Commit 3f17970

Browse files
ajdaviskevinAlbs
authored andcommitted
CDRIVER-2505 fix -lrt flag
1 parent 3e27d48 commit 3f17970

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,6 @@ else ()
261261
message (STATUS "Disabling zlib compression")
262262
endif ()
263263

264-
if (UNIX AND NOT APPLE AND NOT ANDROID)
265-
set (SHM_LIB -lrt)
266-
endif ()
267-
268264
# Ensure the default behavior: don't ignore RPATH settings.
269265
set (CMAKE_SKIP_BUILD_RPATH OFF)
270266

src/libmongoc/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ if (ENABLE_SHM_COUNTERS STREQUAL "ON")
275275
"Shared memory performance counters not supported on Mac or Windows")
276276
endif ()
277277
set (MONGOC_ENABLE_SHM_COUNTERS 1)
278+
set (SHM_LIBRARIES rt)
278279
endif ()
279280

280281
set (MONGOC_INTERNAL_INCLUDE_DIRS "")
@@ -504,7 +505,7 @@ if (CMAKE_USE_PTHREADS_INIT)
504505
endif ()
505506

506507
set (LIBRARIES
507-
${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIB} ${RESOLV_LIBRARIES}
508+
${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES}
508509
${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} Threads::Threads
509510
)
510511

@@ -764,7 +765,7 @@ set (libdir "\${prefix}/lib")
764765

765766
foreach (
766767
FLAG
767-
${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIB} ${RESOLV_LIBRARIES}
768+
${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES}
768769
${THREAD_LIB} ${ZLIB_LIBRARIES} ${SNAPPY_LIBRARIES})
769770

770771
if (IS_ABSOLUTE "${FLAG}")

src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set (MONGOC_LIBRARIES ${MONGOC_LIBRARY} ${BSON_LIBRARIES})
3636
# like "-framework CoreFoundation;-framework Security".
3737
set (IS_FRAMEWORK_VAR 0)
3838
foreach (LIB
39-
@SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIB@ @RESOLV_LIBRARIES@
39+
@SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIBRARIES@ @RESOLV_LIBRARIES@
4040
@SNAPPY_LIBRARIES@
4141
)
4242
if (LIB STREQUAL "-framework")

src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ set (MONGOC_STATIC_LIBRARIES ${MONGOC_STATIC_LIBRARY} ${ZLIB_STATIC_LIBRARY} ${B
4040
# "-framework CoreFoundation -framework Security". Split into a CMake array
4141
# like "-framework CoreFoundation;-framework Security".
4242
set (IS_FRAMEWORK_VAR 0)
43-
foreach (LIB @SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIB@ @ZLIB_LIBRARIES@ @SNAPPY_LIBRARIES@ @RESOLV_LIBRARIES@)
43+
foreach (LIB @SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIBRARIES@ @ZLIB_LIBRARIES@ @SNAPPY_LIBRARIES@ @RESOLV_LIBRARIES@)
4444
if (LIB STREQUAL "-framework")
4545
set (IS_FRAMEWORK_VAR 1)
4646
continue ()

0 commit comments

Comments
 (0)