Merge pull request #22982 from kou/fix-cpp-version

Fix wrong version in gRPCConfigVersion.cmake and grpc++*.pc

CMakeLists.txt

@@ -15128,7 +15128,7 @@ include(CMakePackageConfigHelpers)
 configure_file(cmake/gRPCConfig.cmake.in
   gRPCConfig.cmake @ONLY)
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/gRPCConfigVersion.cmake
-  VERSION ${PACKAGE_VERSION}
+  VERSION ${gRPC_CPP_VERSION}
   COMPATIBILITY AnyNewerVersion)
 install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/gRPCConfig.cmake
@@ -15195,7 +15195,7 @@ generate_pkgconfig(
 generate_pkgconfig(
   "gRPC++"
   "C++ wrapper for gRPC"
-  "${PACKAGE_VERSION}"
+  "${gRPC_CPP_VERSION}"
   "grpc"
   "-lgrpc++ -labsl_bad_optional_access -labsl_str_format_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity -labsl_dynamic_annotations"
   ""
@@ -15205,7 +15205,7 @@ generate_pkgconfig(
 generate_pkgconfig(
   "gRPC++ unsecure"
   "C++ wrapper for gRPC without SSL"
-  "${PACKAGE_VERSION}"
+  "${gRPC_CPP_VERSION}"
   "grpc_unsecure"
   "-lgrpc++_unsecure -labsl_bad_optional_access -labsl_str_format_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity -labsl_dynamic_annotations"
   ""

templates/CMakeLists.txt.template

@@ -690,7 +690,7 @@
   configure_file(cmake/gRPCConfig.cmake.in
     gRPCConfig.cmake @ONLY)
   write_basic_package_version_file(<%text>${CMAKE_CURRENT_BINARY_DIR}/</%text>gRPCConfigVersion.cmake
-    VERSION <%text>${PACKAGE_VERSION}</%text>
+    VERSION <%text>${gRPC_CPP_VERSION}</%text>
     COMPATIBILITY AnyNewerVersion)
   install(FILES
       <%text>${CMAKE_CURRENT_BINARY_DIR}/</%text>gRPCConfig.cmake
@@ -757,7 +757,7 @@
   generate_pkgconfig(
     "gRPC++"
     "C++ wrapper for gRPC"
-    "<%text>${PACKAGE_VERSION}</%text>"
+    "<%text>${gRPC_CPP_VERSION}</%text>"
     "grpc"
     "${" ".join(("-l" + l) for l in ["grpc++",] + list_absl_lib_files_for("grpc++"))}"
     ""
@@ -767,7 +767,7 @@
   generate_pkgconfig(
     "gRPC++ unsecure"
     "C++ wrapper for gRPC without SSL"
-    "<%text>${PACKAGE_VERSION}</%text>"
+    "<%text>${gRPC_CPP_VERSION}</%text>"
     "grpc_unsecure"
     "${" ".join(("-l" + l) for l in ["grpc++_unsecure",] + list_absl_lib_files_for("grpc++_unsecure"))}"
     ""