Cmake_generotor support has been added to enable multi-version VS support (#20755)

cmake/external/protobuf.cmake

@@ -198,7 +198,9 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
         SET(OPTIONAL_CACHE_ARGS "-DZLIB_ROOT:STRING=${ZLIB_ROOT}")
     ENDIF()
     IF(WIN32)
-        SET(OPTIONAL_ARGS ${OPTIONAL_ARGS} "-DCMAKE_GENERATOR_PLATFORM=x64")
+        SET(OPTIONAL_ARGS ${OPTIONAL_ARGS} 
+            "-DCMAKE_GENERATOR=${CMAKE_GENERATOR}"
+            "-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}")
     ENDIF()
 
     SET(PROTOBUF_REPO "https://github.com/protocolbuffers/protobuf.git")
@@ -214,21 +216,21 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
         GIT_TAG         ${PROTOBUF_TAG}
         CONFIGURE_COMMAND
         ${CMAKE_COMMAND} ${PROTOBUF_SOURCES_DIR}/src/${TARGET_NAME}/cmake
-            ${OPTIONAL_ARGS}
-            -Dprotobuf_BUILD_TESTS=OFF
-            -DCMAKE_SKIP_RPATH=ON
-            -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-            -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
-            -DCMAKE_INSTALL_PREFIX=${PROTOBUF_INSTALL_DIR}
-            -DCMAKE_INSTALL_LIBDIR=lib
-            -DBUILD_SHARED_LIBS=OFF
-            -Dprotobuf_MSVC_STATIC_RUNTIME=${MSVC_STATIC_CRT}
+                        ${OPTIONAL_ARGS}
+                        -Dprotobuf_BUILD_TESTS=OFF
+                        -DCMAKE_SKIP_RPATH=ON
+                        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+                        -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
+                        -DCMAKE_INSTALL_PREFIX=${PROTOBUF_INSTALL_DIR}
+                        -DCMAKE_INSTALL_LIBDIR=lib
+                        -DBUILD_SHARED_LIBS=OFF
+                        -Dprotobuf_MSVC_STATIC_RUNTIME=${MSVC_STATIC_CRT}
         CMAKE_CACHE_ARGS
-            -DCMAKE_INSTALL_PREFIX:PATH=${PROTOBUF_INSTALL_DIR}
-            -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
-            -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-            -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-            ${OPTIONAL_CACHE_ARGS}
+                        -DCMAKE_INSTALL_PREFIX:PATH=${PROTOBUF_INSTALL_DIR}
+                        -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
+                        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+                        -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+                        ${OPTIONAL_CACHE_ARGS}
     )
 ENDFUNCTION()
 

cmake/external/xxhash.cmake

@@ -16,26 +16,27 @@ ENDIF()
 
 if(WIN32)
   ExternalProject_Add(
-          extern_xxhash
-          ${EXTERNAL_PROJECT_LOG_ARGS}
-          GIT_REPOSITORY  "https://github.com/Cyan4973/xxHash"
-          GIT_TAG         "v0.6.5"
-          PREFIX          ${XXHASH_SOURCE_DIR}
-          DOWNLOAD_NAME   "xxhash"
-          UPDATE_COMMAND  ""
-          BUILD_IN_SOURCE 1
-          PATCH_COMMAND
-          CONFIGURE_COMMAND
-          ${CMAKE_COMMAND} ${XXHASH_SOURCE_DIR}/src/extern_xxhash/cmake_unofficial
-          -DCMAKE_INSTALL_PREFIX:PATH=${XXHASH_INSTALL_DIR}
-          -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-          -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-          -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-          -DBUILD_XXHSUM=OFF
-          -DCMAKE_GENERATOR_PLATFORM=x64
-          -DBUILD_SHARED_LIBS=OFF
-          ${OPTIONAL_CACHE_ARGS}
-          TEST_COMMAND      ""
+      extern_xxhash
+      ${EXTERNAL_PROJECT_LOG_ARGS}
+      GIT_REPOSITORY  "https://github.com/Cyan4973/xxHash"
+      GIT_TAG         "v0.6.5"
+      PREFIX          ${XXHASH_SOURCE_DIR}
+      DOWNLOAD_NAME   "xxhash"
+      UPDATE_COMMAND  ""
+      BUILD_IN_SOURCE 1
+      PATCH_COMMAND
+      CONFIGURE_COMMAND
+      ${CMAKE_COMMAND} ${XXHASH_SOURCE_DIR}/src/extern_xxhash/cmake_unofficial
+                      -DCMAKE_INSTALL_PREFIX:PATH=${XXHASH_INSTALL_DIR}
+                      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+                      -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+                      -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+                      -DBUILD_XXHSUM=OFF
+                      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+                      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+                      -DBUILD_SHARED_LIBS=OFF
+                      ${OPTIONAL_CACHE_ARGS}
+      TEST_COMMAND      ""
   )
 else()
   ExternalProject_Add(
@@ -47,7 +48,7 @@ else()
       DOWNLOAD_NAME   "xxhash"
       UPDATE_COMMAND  ""
       CONFIGURE_COMMAND ""
-      BUILD_IN_SOURCE 1
+      BUILD_IN_SOURCE  1
       PATCH_COMMAND
       BUILD_COMMAND     ${BUILD_CMD}
       INSTALL_COMMAND   export PREFIX=${XXHASH_INSTALL_DIR}/ && make install