CXX-2971 Fix bsoncxx package name in pkg-config requires field (#1103)

* Depend on CMake to handle quoting of command-line arguments correctly

* CXX-2971 Fix bsoncxx package name in pkg-config requires list

* Address "argument isn't numeric in numeric comparison" pkg-config warnings

Author: eramongodb

CMakeLists.txt

@@ -438,16 +438,16 @@ install(FILES LICENSE README.md THIRD-PARTY-NOTICES
 # This is the command that produces the distribution tarball
 add_custom_command(OUTPUT ${DIST_FILE}
     COMMAND ${CMAKE_COMMAND}
-    -D CMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake/make_dist
-    -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
-    -D MONGOCXX_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-    -D BUILD_SOURCE_DIR=${BUILD_SOURCE_DIR}
-    -D SHELL=${SHELL}
-    "-Ddist_generated=\"${dist_generated}\""
-    -P ${PROJECT_SOURCE_DIR}/cmake/make_dist/MakeDist.cmake
+        -D "CMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake/make_dist"
+        -D "PACKAGE_PREFIX=${PACKAGE_PREFIX}"
+        -D "MONGOCXX_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
+        -D "BUILD_SOURCE_DIR=${BUILD_SOURCE_DIR}"
+        -D "SHELL=${SHELL}"
+        -D "dist_generated=${dist_generated}"
+        -P ${PROJECT_SOURCE_DIR}/cmake/make_dist/MakeDist.cmake
 
     DEPENDS
-    ${ALL_DIST} ${dist_generated_depends}
+        ${ALL_DIST} ${dist_generated_depends}
 )
 
 if(NOT(TARGET dist OR TARGET distcheck))

src/bsoncxx/cmake/CMakeLists.txt

@@ -84,17 +84,17 @@ if(1)
         add_custom_command(
             OUTPUT ${pcfilename}
             COMMAND ${CMAKE_COMMAND}
-                -D src_dir="${CMAKE_CURRENT_SOURCE_DIR}"
-                -D bin_dir="${CMAKE_CURRENT_BINARY_DIR}"
-                -D prefix="${CMAKE_INSTALL_PREFIX}"
-                -D includedir="${CMAKE_INSTALL_INCLUDEDIR}"
-                -D libdir="${CMAKE_INSTALL_LIBDIR}"
-                -D output_name="${output_name}"
-                -D version="${BSONCXX_VERSION}"
-                -D is_static="${is_static}"
-                -D libbson_req_abi_ver="${LIBBSON_REQUIRED_ABI_VERSION}"
-                -D libbson_req_ver="${LIBBSON_REQUIRED_VERSION}"
-                -D mnmlstc_enabled="${BSONCXX_POLY_MNMLSTC_ENABLED}"
+                -D "src_dir=${CMAKE_CURRENT_SOURCE_DIR}"
+                -D "bin_dir=${CMAKE_CURRENT_BINARY_DIR}"
+                -D "prefix=${CMAKE_INSTALL_PREFIX}"
+                -D "includedir=${CMAKE_INSTALL_INCLUDEDIR}"
+                -D "libdir=${CMAKE_INSTALL_LIBDIR}"
+                -D "output_name=${output_name}"
+                -D "version=${BSONCXX_VERSION_NO_EXTRA}"
+                -D "is_static=${is_static}"
+                -D "libbson_req_abi_ver=${LIBBSON_REQUIRED_ABI_VERSION}"
+                -D "libbson_req_ver=${LIBBSON_REQUIRED_VERSION}"
+                -D "mnmlstc_enabled=${BSONCXX_POLY_MNMLSTC_ENABLED}"
                 -P ${CMAKE_CURRENT_SOURCE_DIR}/generate-pc.cmake
             MAIN_DEPENDENCY
                 ${CMAKE_CURRENT_SOURCE_DIR}/libbsoncxx.pc.in

src/mongocxx/cmake/CMakeLists.txt

@@ -61,28 +61,38 @@ if(1)
 
         set(pcfilename "${CMAKE_CURRENT_BINARY_DIR}/lib${output_name}.pc")
 
-        if(LINK_TYPE STREQUAL "STATIC")
-            get_target_property(bsoncxx_name bsoncxx_static OUTPUT_NAME)
-            set(is_static 1)
+        if (ENABLE_ABI_TAG_IN_PKGCONFIG_FILENAMES)
+            if(LINK_TYPE STREQUAL "STATIC")
+                get_target_property(bsoncxx_name bsoncxx_static OUTPUT_NAME)
+                set(is_static 1)
+            else()
+                get_target_property(bsoncxx_name bsoncxx_shared OUTPUT_NAME)
+                set(is_static 0)
+            endif()
         else()
-            get_target_property(bsoncxx_name bsoncxx_shared OUTPUT_NAME)
-            set(is_static 0)
+            if(LINK_TYPE STREQUAL "STATIC")
+                set(bsoncxx_name "$CACHE{BSONCXX_OUTPUT_BASENAME}-static")
+                set(is_static 1)
+            else()
+                set(bsoncxx_name "$CACHE{BSONCXX_OUTPUT_BASENAME}")
+                set(is_static 0)
+            endif()
         endif()
 
         add_custom_command(
             OUTPUT ${pcfilename}
             COMMAND ${CMAKE_COMMAND}
-                -D src_dir="${CMAKE_CURRENT_SOURCE_DIR}"
-                -D bin_dir="${CMAKE_CURRENT_BINARY_DIR}"
-                -D prefix="${CMAKE_INSTALL_PREFIX}"
-                -D includedir="${CMAKE_INSTALL_INCLUDEDIR}"
-                -D libdir="${CMAKE_INSTALL_LIBDIR}"
-                -D output_name="${output_name}"
-                -D version="${MONGOCXX_VERSION}"
-                -D is_static="${is_static}"
-                -D bsoncxx_name="${bsoncxx_name}"
-                -D libmongoc_req_abi_ver="${LIBMONGOC_REQUIRED_ABI_VERSION}"
-                -D libmongoc_req_ver="${LIBMONGOC_REQUIRED_VERSION}"
+                -D "src_dir=${CMAKE_CURRENT_SOURCE_DIR}"
+                -D "bin_dir=${CMAKE_CURRENT_BINARY_DIR}"
+                -D "prefix=${CMAKE_INSTALL_PREFIX}"
+                -D "includedir=${CMAKE_INSTALL_INCLUDEDIR}"
+                -D "libdir=${CMAKE_INSTALL_LIBDIR}"
+                -D "output_name=${output_name}"
+                -D "version=${MONGOCXX_VERSION_NO_EXTRA}"
+                -D "is_static=${is_static}"
+                -D "bsoncxx_name=${bsoncxx_name}"
+                -D "libmongoc_req_abi_ver=${LIBMONGOC_REQUIRED_ABI_VERSION}"
+                -D "libmongoc_req_ver=${LIBMONGOC_REQUIRED_VERSION}"
                 -P ${CMAKE_CURRENT_SOURCE_DIR}/generate-pc.cmake
             MAIN_DEPENDENCY
                 ${CMAKE_CURRENT_SOURCE_DIR}/libmongocxx.pc.in