update cmake files to not use hardcoded paths

librato · Sep 7, 2023 · c246e34 · c246e34
1 parent 9a33622
commit c246e34
Show file tree

Hide file tree

Showing 4 changed files with 714 additions and 709 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -70,7 +70,6 @@ jobs:
         working-directory: ${{ github.workspace }}/build_windows_${{ matrix.arch }}
         shell: cmd
         run: |
-          del /F /Q CMakeCache.txt
           msbuild.exe -maxcpucount /t:Build /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ env.PLATFORM }} /fl /flp:logfile=build-${{ matrix.arch }}.${{ matrix.configuration }}.log;verbosity=diagnostic grpc.sln
 
 
diff --git a/build_windows_64/CPackConfig.cmake b/build_windows_64/CPackConfig.cmake
@@ -9,14 +9,16 @@
 # (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
 # usually begin with CPACK_<GENNAME>_xxxx.
 
+set(CPACK_BUILD_SOURCE "D:/a/grpc/grpc")
+set(CPACK_BUILD_VS_CMAKE_SHARE "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.26")
 
 set(CPACK_BINARY_7Z "OFF")
 set(CPACK_BINARY_IFW "OFF")
 set(CPACK_BINARY_NSIS "ON")
 set(CPACK_BINARY_NUGET "OFF")
 set(CPACK_BINARY_WIX "OFF")
 set(CPACK_BINARY_ZIP "OFF")
-set(CPACK_BUILD_SOURCE_DIRS "C:/work/projects/grpc;C:/work/projects/grpc/build_windows_64")
+set(CPACK_BUILD_SOURCE_DIRS "${CPACK_BUILD_SOURCE};${CPACK_BUILD_SOURCE}/build_windows_64")
 set(CPACK_CMAKE_GENERATOR "Visual Studio 17 2022")
 set(CPACK_COMPONENTS_ALL "Devel;Library;Tools;Unspecified")
 set(CPACK_COMPONENT_Devel_DESCRIPTION "Development files for compiling against c-ares.")
@@ -30,13 +32,13 @@ set(CPACK_COMPONENT_Tools_DISPLAY_NAME "c-ares Tools")
 set(CPACK_COMPONENT_Tools_REQUIRED "0")
 set(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
 set(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_FILE "C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.24/Templates/CPack.GenericDescription.txt")
+set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_FILE "${CPACK_BUILD_VS_CMAKE_SHARE}/Templates/CPack.GenericDescription.txt")
 set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_SUMMARY "grpc built using CMake")
 set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE "ON")
 set(CPACK_GENERATOR "NSIS")
-set(CPACK_INSTALL_CMAKE_PROJECTS "C:/work/projects/grpc/build_windows_64;grpc;ALL;/")
+set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_BUILD_SOURCE}/build_windows_64;grpc;ALL;/")
 set(CPACK_INSTALL_PREFIX "C:/Program Files/grpc")
-set(CPACK_MODULE_PATH "C:/work/projects/grpc/cmake/modules")
+set(CPACK_MODULE_PATH "${CPACK_BUILD_SOURCE}/cmake/modules")
 set(CPACK_NSIS_DISPLAY_NAME "c-ares")
 set(CPACK_NSIS_DISPLAY_NAME_SET "TRUE")
 set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")
@@ -46,10 +48,10 @@ set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
 set(CPACK_NSIS_PACKAGE_NAME "c-ares")
 set(CPACK_NSIS_UNINSTALL_NAME "Uninstall")
 set(CPACK_NSIS_URL_INFO_ABOUT "https://c-ares.haxx.se/")
-set(CPACK_OUTPUT_CONFIG_FILE "C:/work/projects/grpc/build_windows_64/CPackConfig.cmake")
+set(CPACK_OUTPUT_CONFIG_FILE "${CPACK_BUILD_SOURCE}/build_windows_64/CPackConfig.cmake")
 set(CPACK_PACKAGE_CONTACT "https://c-ares.haxx.se/")
 set(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.24/Templates/CPack.GenericDescription.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_BUILD_VS_CMAKE_SHARE}/Templates/CPack.GenericDescription.txt")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A C library for asynchronous DNS requests")
 set(CPACK_PACKAGE_FILE_NAME "c-ares-1.17.2-win64")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://c-ares.haxx.se/")
@@ -62,21 +64,21 @@ set(CPACK_PACKAGE_VERSION "1.17.2")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "17")
 set(CPACK_PACKAGE_VERSION_PATCH "2")
-set(CPACK_RESOURCE_FILE_LICENSE "C:/work/projects/grpc/third_party/cares/cares/LICENSE.md")
-set(CPACK_RESOURCE_FILE_README "C:/work/projects/grpc/third_party/cares/cares/README.md")
-set(CPACK_RESOURCE_FILE_WELCOME "C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.24/Templates/CPack.GenericWelcome.txt")
+set(CPACK_RESOURCE_FILE_LICENSE "${CPACK_BUILD_SOURCE}/third_party/cares/cares/LICENSE.md")
+set(CPACK_RESOURCE_FILE_README "${CPACK_BUILD_SOURCE}/third_party/cares/cares/README.md")
+set(CPACK_RESOURCE_FILE_WELCOME "${CPACK_BUILD_VS_CMAKE_SHARE}/Templates/CPack.GenericWelcome.txt")
 set(CPACK_SET_DESTDIR "OFF")
 set(CPACK_SOURCE_7Z "ON")
 set(CPACK_SOURCE_GENERATOR "7Z;ZIP")
-set(CPACK_SOURCE_OUTPUT_CONFIG_FILE "C:/work/projects/grpc/build_windows_64/CPackSourceConfig.cmake")
+set(CPACK_SOURCE_OUTPUT_CONFIG_FILE "${CPACK_BUILD_SOURCE}/build_windows_64/CPackSourceConfig.cmake")
 set(CPACK_SOURCE_ZIP "ON")
 set(CPACK_SYSTEM_NAME "win64")
 set(CPACK_THREADS "1")
 set(CPACK_TOPLEVEL_TAG "win64")
 set(CPACK_WIX_SIZEOF_VOID_P "8")
 
 if(NOT CPACK_PROPERTIES_FILE)
-  set(CPACK_PROPERTIES_FILE "C:/work/projects/grpc/build_windows_64/CPackProperties.cmake")
+  set(CPACK_PROPERTIES_FILE "${CPACK_BUILD_SOURCE}/build_windows_64/CPackProperties.cmake")
 endif()
 
 if(EXISTS ${CPACK_PROPERTIES_FILE})

diff --git a/build_windows_64/CPackSourceConfig.cmake b/build_windows_64/CPackSourceConfig.cmake
@@ -9,14 +9,16 @@
 # (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
 # usually begin with CPACK_<GENNAME>_xxxx.
 
+set(CPACK_BUILD_SOURCE "D:/a/grpc/grpc")
+set(CPACK_BUILD_VS_CMAKE_SHARE "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.26")
 
 set(CPACK_BINARY_7Z "OFF")
 set(CPACK_BINARY_IFW "OFF")
 set(CPACK_BINARY_NSIS "ON")
 set(CPACK_BINARY_NUGET "OFF")
 set(CPACK_BINARY_WIX "OFF")
 set(CPACK_BINARY_ZIP "OFF")
-set(CPACK_BUILD_SOURCE_DIRS "C:/work/projects/grpc;C:/work/projects/grpc/build_windows_64")
+set(CPACK_BUILD_SOURCE_DIRS "${CPACK_BUILD_SOURCE};${CPACK_BUILD_SOURCE}/build_windows_64")
 set(CPACK_CMAKE_GENERATOR "Visual Studio 17 2022")
 set(CPACK_COMPONENTS_ALL "Devel;Library;Tools;Unspecified")
 set(CPACK_COMPONENT_Devel_DESCRIPTION "Development files for compiling against c-ares.")
@@ -30,15 +32,15 @@ set(CPACK_COMPONENT_Tools_DISPLAY_NAME "c-ares Tools")
 set(CPACK_COMPONENT_Tools_REQUIRED "0")
 set(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
 set(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_FILE "C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.24/Templates/CPack.GenericDescription.txt")
+set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_FILE "${CPACK_BUILD_VS_CMAKE_SHARE}/Templates/CPack.GenericDescription.txt")
 set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_SUMMARY "grpc built using CMake")
 set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE "ON")
 set(CPACK_GENERATOR "7Z;ZIP")
 set(CPACK_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp\$;\\.#;/#")
 set(CPACK_INSTALLED_DIRECTORIES "C:/work/projects/grpc;/")
 set(CPACK_INSTALL_CMAKE_PROJECTS "")
 set(CPACK_INSTALL_PREFIX "C:/Program Files/grpc")
-set(CPACK_MODULE_PATH "C:/work/projects/grpc/cmake/modules")
+set(CPACK_MODULE_PATH "${CPACK_BUILD_SOURCE}/cmake/modules")
 set(CPACK_NSIS_DISPLAY_NAME "c-ares")
 set(CPACK_NSIS_DISPLAY_NAME_SET "TRUE")
 set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")
@@ -48,10 +50,10 @@ set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
 set(CPACK_NSIS_PACKAGE_NAME "c-ares")
 set(CPACK_NSIS_UNINSTALL_NAME "Uninstall")
 set(CPACK_NSIS_URL_INFO_ABOUT "https://c-ares.haxx.se/")
-set(CPACK_OUTPUT_CONFIG_FILE "C:/work/projects/grpc/build_windows_64/CPackConfig.cmake")
+set(CPACK_OUTPUT_CONFIG_FILE "${CPACK_BUILD_SOURCE}/build_windows_64/CPackConfig.cmake")
 set(CPACK_PACKAGE_CONTACT "https://c-ares.haxx.se/")
 set(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.24/Templates/CPack.GenericDescription.txt")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_BUILD_VS_CMAKE_SHARE}/Templates/CPack.GenericDescription.txt")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A C library for asynchronous DNS requests")
 set(CPACK_PACKAGE_FILE_NAME "c-ares-1.17.2-Source")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://c-ares.haxx.se/")
@@ -64,16 +66,16 @@ set(CPACK_PACKAGE_VERSION "1.17.2")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "17")
 set(CPACK_PACKAGE_VERSION_PATCH "2")
-set(CPACK_RESOURCE_FILE_LICENSE "C:/work/projects/grpc/third_party/cares/cares/LICENSE.md")
-set(CPACK_RESOURCE_FILE_README "C:/work/projects/grpc/third_party/cares/cares/README.md")
-set(CPACK_RESOURCE_FILE_WELCOME "C:/Program Files/Microsoft Visual Studio/2022/Professional/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.24/Templates/CPack.GenericWelcome.txt")
+set(CPACK_RESOURCE_FILE_LICENSE "${CPACK_BUILD_SOURCE}/third_party/cares/cares/LICENSE.md")
+set(CPACK_RESOURCE_FILE_README "${CPACK_BUILD_SOURCE}/third_party/cares/cares/README.md")
+set(CPACK_RESOURCE_FILE_WELCOME "${CPACK_BUILD_VS_CMAKE_SHARE}/Templates/CPack.GenericWelcome.txt")
 set(CPACK_RPM_PACKAGE_SOURCES "ON")
 set(CPACK_SET_DESTDIR "OFF")
 set(CPACK_SOURCE_7Z "ON")
 set(CPACK_SOURCE_GENERATOR "7Z;ZIP")
 set(CPACK_SOURCE_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp\$;\\.#;/#")
 set(CPACK_SOURCE_INSTALLED_DIRECTORIES "C:/work/projects/grpc;/")
-set(CPACK_SOURCE_OUTPUT_CONFIG_FILE "C:/work/projects/grpc/build_windows_64/CPackSourceConfig.cmake")
+set(CPACK_SOURCE_OUTPUT_CONFIG_FILE "${CPACK_BUILD_SOURCE}/build_windows_64/CPackSourceConfig.cmake")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "c-ares-1.17.2-Source")
 set(CPACK_SOURCE_TOPLEVEL_TAG "win64-Source")
 set(CPACK_SOURCE_ZIP "ON")
@@ -84,7 +86,7 @@ set(CPACK_TOPLEVEL_TAG "win64-Source")
 set(CPACK_WIX_SIZEOF_VOID_P "8")
 
 if(NOT CPACK_PROPERTIES_FILE)
-  set(CPACK_PROPERTIES_FILE "C:/work/projects/grpc/build_windows_64/CPackProperties.cmake")
+  set(CPACK_PROPERTIES_FILE "${CPACK_BUILD_SOURCE}/build_windows_64/CPackProperties.cmake")
 endif()
 
 if(EXISTS ${CPACK_PROPERTIES_FILE})