CDRIVER-2083 fix semicolons in pkg-config files

When libmongoc-1.0.pc and libmongoc-static-1.0.pc were generated by CMake, the "Libs" list could be semicolon-delimited, rather than space-delimited.
mongodb · Apr 21, 2017 · 11cda66 · 11cda66
1 parent ce0a2ad
commit 11cda66
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -687,6 +687,11 @@ install(
 set(VERSION "${MONGOC_VERSION}")
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(libdir "\${prefix}/lib")
+
+foreach(FLAG ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB})
+   set(pkg_config_libs "${pkg_config_libs} ${FLAG}")
+endforeach()
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-1.0.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/libmongoc-1.0.pc

diff --git a/src/libmongoc-1.0.pc.in b/src/libmongoc-1.0.pc.in
@@ -7,5 +7,5 @@ Name: libmongoc
 Description: The libmongoc MongoDB client library.
 Version: @VERSION@
 Requires: libbson-1.0
-Libs: -L${libdir} -lmongoc-1.0 @SASL_LIBS@ @SSL_LIBS@ @SHM_LIB@
+Libs: -L${libdir} -lmongoc-1.0 @pkg_config_libs@
 Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@
diff --git a/src/libmongoc-static-1.0.pc.in b/src/libmongoc-static-1.0.pc.in
@@ -7,5 +7,5 @@ Name: libmongoc
 Description: The libmongoc MongoDB client library.
 Version: @VERSION@
 Requires: libbson-static-1.0
-Libs: -L${libdir} -lmongoc-static-1.0 @SASL_LIBS@ @SSL_LIBS@ @SHM_LIB@
+Libs: -L${libdir} -lmongoc-static-1.0 @pkg_config_libs@
 Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@