32 bit - update cmake locations to use VS macros and also VS_CMAKE_VE…

…RSION env variable
librato · Sep 7, 2023 · b0daec9 · b0daec9
1 parent a63687e
commit b0daec9
Show file tree

Hide file tree

Showing 204 changed files with 1,452 additions and 1,452 deletions.
diff --git a/build_windows_32/ALL_BUILD.vcxproj b/build_windows_32/ALL_BUILD.vcxproj
diff --git a/build_windows_32/CMakeFiles/CheckASM_NASM/ALL_BUILD.vcxproj b/build_windows_32/CMakeFiles/CheckASM_NASM/ALL_BUILD.vcxproj
diff --git a/build_windows_32/CMakeFiles/CheckASM_NASM/ZERO_CHECK.vcxproj b/build_windows_32/CMakeFiles/CheckASM_NASM/ZERO_CHECK.vcxproj
diff --git a/build_windows_32/INSTALL.vcxproj b/build_windows_32/INSTALL.vcxproj
@@ -71,7 +71,7 @@
       <Message>
       </Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -90,7 +90,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <Message>
       </Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -109,7 +109,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <Message>
       </Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -128,7 +128,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <Message>
       </Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -221,6 +221,6 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.26\Templates\MSBuild\nasm.targets" />
+    <Import Project="$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\share\cmake-$(VS_CMAKE_VERSION)\Templates\MSBuild\nasm.targets" />
   </ImportGroup>
 </Project>
diff --git a/build_windows_32/PACKAGE.vcxproj b/build_windows_32/PACKAGE.vcxproj
@@ -233,6 +233,6 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.26\Templates\MSBuild\nasm.targets" />
+    <Import Project="$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\share\cmake-$(VS_CMAKE_VERSION)\Templates\MSBuild\nasm.targets" />
   </ImportGroup>
 </Project>
diff --git a/build_windows_32/ZERO_CHECK.vcxproj b/build_windows_32/ZERO_CHECK.vcxproj
diff --git a/build_windows_32/address_sorting.vcxproj b/build_windows_32/address_sorting.vcxproj
diff --git a/build_windows_32/gpr.vcxproj b/build_windows_32/gpr.vcxproj
diff --git a/build_windows_32/grpc++.vcxproj b/build_windows_32/grpc++.vcxproj
diff --git a/build_windows_32/grpc++_alts.vcxproj b/build_windows_32/grpc++_alts.vcxproj
diff --git a/build_windows_32/grpc++_error_details.vcxproj b/build_windows_32/grpc++_error_details.vcxproj
diff --git a/build_windows_32/grpc++_reflection.vcxproj b/build_windows_32/grpc++_reflection.vcxproj
diff --git a/build_windows_32/grpc++_unsecure.vcxproj b/build_windows_32/grpc++_unsecure.vcxproj
diff --git a/build_windows_32/grpc.vcxproj b/build_windows_32/grpc.vcxproj
diff --git a/build_windows_32/grpc_cpp_plugin.vcxproj b/build_windows_32/grpc_cpp_plugin.vcxproj
diff --git a/build_windows_32/grpc_csharp_plugin.vcxproj b/build_windows_32/grpc_csharp_plugin.vcxproj
diff --git a/build_windows_32/grpc_node_plugin.vcxproj b/build_windows_32/grpc_node_plugin.vcxproj
diff --git a/build_windows_32/grpc_objective_c_plugin.vcxproj b/build_windows_32/grpc_objective_c_plugin.vcxproj
diff --git a/build_windows_32/grpc_php_plugin.vcxproj b/build_windows_32/grpc_php_plugin.vcxproj
diff --git a/build_windows_32/grpc_plugin_support.vcxproj b/build_windows_32/grpc_plugin_support.vcxproj
diff --git a/build_windows_32/grpc_python_plugin.vcxproj b/build_windows_32/grpc_python_plugin.vcxproj
diff --git a/build_windows_32/grpc_ruby_plugin.vcxproj b/build_windows_32/grpc_ruby_plugin.vcxproj
diff --git a/build_windows_32/grpc_unsecure.vcxproj b/build_windows_32/grpc_unsecure.vcxproj
diff --git a/build_windows_32/grpcpp_channelz.vcxproj b/build_windows_32/grpcpp_channelz.vcxproj
diff --git a/build_windows_32/plugins.vcxproj b/build_windows_32/plugins.vcxproj
diff --git a/build_windows_32/third_party/abseil-cpp/ALL_BUILD.vcxproj b/build_windows_32/third_party/abseil-cpp/ALL_BUILD.vcxproj
diff --git a/build_windows_32/third_party/abseil-cpp/Continuous.vcxproj b/build_windows_32/third_party/abseil-cpp/Continuous.vcxproj
diff --git a/build_windows_32/third_party/abseil-cpp/Experimental.vcxproj b/build_windows_32/third_party/abseil-cpp/Experimental.vcxproj
diff --git a/build_windows_32/third_party/abseil-cpp/INSTALL.vcxproj b/build_windows_32/third_party/abseil-cpp/INSTALL.vcxproj
@@ -70,7 +70,7 @@
       <UseUtf8Encoding>Always</UseUtf8Encoding>
       <Message></Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -85,7 +85,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <UseUtf8Encoding>Always</UseUtf8Encoding>
       <Message></Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -100,7 +100,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <UseUtf8Encoding>Always</UseUtf8Encoding>
       <Message></Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -115,7 +115,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
       <UseUtf8Encoding>Always</UseUtf8Encoding>
       <Message></Message>
       <Command>setlocal
-"C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
+"$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake
 if %errorlevel% neq 0 goto :cmEnd
 :cmEnd
 endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
@@ -201,6 +201,6 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.26\Templates\MSBuild\nasm.targets" />
+    <Import Project="$(VCIDEInstallDir)..\CommonExtensions\Microsoft\CMake\CMake\share\cmake-$(VS_CMAKE_VERSION)\Templates\MSBuild\nasm.targets" />
   </ImportGroup>
 </Project>