[CDRIVER-4733] Replace version macros expanded in configure-generated files (#1411)

Author: vector-of-bool

CMakeLists.txt

@@ -333,7 +333,7 @@ if (USE_SYSTEM_LIBBSON)
    # but you should use the standard CMAKE_PREFIX_PATH instead.
    message (STATUS "Searching for libbson CMake packages")
    find_package (bson-1.0
-      "${MONGOC_MAJOR_VERSION}.${MONGOC_MINOR_VERSION}.${MONGOC_MICRO_VERSION}"
+      "${PROJECT_VERSION}"
       HINTS
       ${BSON_ROOT_DIR})
 

src/libmongoc/src/mongoc-config.cmake

@@ -1,5 +1,5 @@
 include(CMakeFindDependencyMacro)
-find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@)
+find_dependency(bson-1.0 @libmongoc_VERSION@)
 include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake")
 
 unset(_required)

src/libmongoc/src/mongoc/mongoc-version.h.in

@@ -15,10 +15,11 @@
  */
 
 
-#if !defined (MONGOC_INSIDE) && !defined (MONGOC_COMPILATION)
+#if !defined(MONGOC_INSIDE) && !defined(MONGOC_COMPILATION)
 #error "Only <mongoc/mongoc.h> can be included directly."
 #endif
 
+// clang-format off
 
 #ifndef MONGOC_VERSION_H
 #define MONGOC_VERSION_H
@@ -29,39 +30,39 @@
  *
  * MONGOC major version component (e.g. 1 if %MONGOC_VERSION is 1.2.3)
  */
-#define MONGOC_MAJOR_VERSION (@MONGOC_MAJOR_VERSION@)
+#define MONGOC_MAJOR_VERSION (@libmongoc_VERSION_MAJOR@)
 
 
 /**
  * MONGOC_MINOR_VERSION:
  *
  * MONGOC minor version component (e.g. 2 if %MONGOC_VERSION is 1.2.3)
  */
-#define MONGOC_MINOR_VERSION (@MONGOC_MINOR_VERSION@)
+#define MONGOC_MINOR_VERSION (@libmongoc_VERSION_MINOR@)
 
 
 /**
  * MONGOC_MICRO_VERSION:
  *
  * MONGOC micro version component (e.g. 3 if %MONGOC_VERSION is 1.2.3)
  */
-#define MONGOC_MICRO_VERSION (@MONGOC_MICRO_VERSION@)
+#define MONGOC_MICRO_VERSION (@libmongoc_VERSION_PATCH@)
 
 
 /**
  * MONGOC_PRERELEASE_VERSION:
  *
  * MONGOC prerelease version component (e.g. pre if %MONGOC_VERSION is 1.2.3-pre)
  */
-#define MONGOC_PRERELEASE_VERSION (@MONGOC_PRERELEASE_VERSION@)
+#define MONGOC_PRERELEASE_VERSION (@libmongoc_VERSION_PRERELEASE@)
 
 
 /**
  * MONGOC_VERSION:
  *
  * MONGOC version.
  */
-#define MONGOC_VERSION (@MONGOC_VERSION@)
+#define MONGOC_VERSION (@libmongoc_VERSION_FULL@)
 
 
 /**
@@ -70,7 +71,7 @@
  * MONGOC version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define MONGOC_VERSION_S "@MONGOC_VERSION@"
+#define MONGOC_VERSION_S "@libmongoc_VERSION_FULL@"
 
 
 /**