From f584243f4e1c59fad724fbb65eddb84ce6346c08 Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Tue, 14 Jun 2022 11:48:36 +0530 Subject: [PATCH 1/7] update: update vcpkgGitRef to update vcpkg version --- azure-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-vars.yml b/azure-vars.yml index eec03a5dd..ca31958ed 100644 --- a/azure-vars.yml +++ b/azure-vars.yml @@ -1,3 +1,3 @@ variables: - vcpkgGitRef: 1be51cb4579e8f34317a0e53256095219ea85702 # Update this git ref to update vcpkg + vcpkgGitRef: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44 # Update this git ref to update vcpkg releasetag: 'RadialGM-$(Build.SourceVersion)' From 62eafad579250ddfae1193a5d3bf6c21101ddb64 Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:35:00 +0530 Subject: [PATCH 2/7] update visual studio version, add separate VS 2019 pipeline --- azure-jobs.yml | 101 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 5 deletions(-) diff --git a/azure-jobs.yml b/azure-jobs.yml index 271efabd9..531025b27 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -115,6 +115,97 @@ jobs: assets: | $(Agent.BuildDirectory)/RadialGM-MinGW-$(MINGW_ARCH).exe +- job: MSVC_64_VS_2019 + displayName: 'MSVC x86_64 (Visual Studio 2019)' + ? ${{ if and(eq(parameters.repo, 'self'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) }} + : dependsOn: CreateReleaseCandidate + pool: + vmImage: 'windows-2019' + timeoutInMinutes: 360 + + steps: + - checkout: ${{ parameters.repo }} + submodules: true + path: RadialGM + persistCredentials: true + + - ${{ if ne(parameters.repo, 'self') }}: + - script: | + cd $(Agent.BuildDirectory)/RadialGM/Submodules/enigma-dev + git remote remove origin + git remote add origin https://github.com/enigma-dev/enigma-dev.git + git remote -v + git fetch origin --force --tags --prune --progress ${{ parameters.enigmaref }}:enigmaref + git checkout --progress --force enigmaref + displayName: Checkout ENIGMA Reference + + - task: Cache@2 + displayName: 'Cache VCPKG Artifacts' + inputs: + key: $(Agent.BuildDirectory)/RadialGM/msvc-x64-deps.txt | "$(vcpkgGitRef)" | "$(Agent.OS)" + path: '$(Build.BinariesDirectory)/vcpkg' + + - task: run-vcpkg@0 + displayName: 'Run VCPKG' + inputs: + vcpkgArguments: '@$(Agent.BuildDirectory)/RadialGM/msvc-x64-deps.txt' + vcpkgGitCommitId: $(vcpkgGitRef) + vcpkgGitURL: https://github.com/microsoft/vcpkg.git + + - script: | + set PATH=%PATH%;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\tools\qt5\bin\ + set VCINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC + call "%VCINSTALLDIR%\Auxiliary\Build\vcvars64.bat" + cd $(Build.SourcesDirectory)/RadialGM + mkdir Release + cd Release + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake --build . --config MinSizeRel + cmake --install . --config MinSizeRel + displayName: 'Release Build' + + - script: | + set PATH=%PATH%;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\debug\bin;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\bin;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\tools\qt5\debug\bin\ + set VCINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC + call "%VCINSTALLDIR%\Auxiliary\Build\vcvars64.bat" + cd $(Build.SourcesDirectory)/RadialGM + mkdir Debug + cd Debug + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake --build . --config Debug + cmake --install . --config Debug + displayName: 'Debug Build' + + - script: | + cd $(Agent.BuildDirectory)/RadialGM + mkdir package + cd package + cmake -G "Visual Studio 16 2019" -A x64 ../cmake-package + cmake --build . --config Release --target PACKAGE + mv ENIGMA-Installer*.exe $(Agent.BuildDirectory)/RadialGM-MSVC-x86_64.exe + displayName: 'Package' + + - task: PublishBuildArtifacts@1 + displayName: 'Push Build Artifacts' + inputs: + pathtoPublish: '$(Agent.BuildDirectory)/RadialGM-MSVC-x86_64.exe' + artifactName: RadialGM-MSVC-x86_64 + + - ? ${{ if and(eq(parameters.repo, 'self'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) }} + : - task: GithubRelease@0 + displayName: 'Add MSVC to GitHub Release' + inputs: + gitHubConnection: github.com_EnigmaBot + repositoryName: enigma-dev/RadialGM + action: edit + tagSource: manual + tag: '$(releasetag)' + isDraft: true + isPreRelease: true + assetUploadMode: replace + assets: | + $(Agent.BuildDirectory)/RadialGM-MSVC-x86_64.exe + - job: MSVC_64 displayName: 'MSVC x86_64' ${{ if and(eq(parameters.repo, 'self'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) }}: @@ -154,24 +245,24 @@ jobs: - script: | set PATH=%PATH%;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\tools\qt5\bin\ - set VCINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC + set VCINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\VC call "%VCINSTALLDIR%\Auxiliary\Build\vcvars64.bat" cd $(Build.SourcesDirectory)/RadialGM mkdir Release cd Release - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM cmake --build . --config MinSizeRel cmake --install . --config MinSizeRel displayName: 'Release Build' - script: | set PATH=%PATH%;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\debug\bin;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\bin;$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\tools\qt5\debug\bin\ - set VCINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC + set VCINSTALLDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\VC call "%VCINSTALLDIR%\Auxiliary\Build\vcvars64.bat" cd $(Build.SourcesDirectory)/RadialGM mkdir Debug cd Debug - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM cmake --build . --config Debug cmake --install . --config Debug displayName: 'Debug Build' @@ -180,7 +271,7 @@ jobs: cd $(Agent.BuildDirectory)/RadialGM mkdir package cd package - cmake -G "Visual Studio 16 2019" -A x64 ../cmake-package + cmake -G "Visual Studio 17 2022" -A x64 ../cmake-package cmake --build . --config Release --target PACKAGE mv ENIGMA-Installer*.exe $(Agent.BuildDirectory)/RadialGM-MSVC-x86_64.exe displayName: 'Package' From d49e71747fcb8442b5ccc9f986ae6d093bab426d Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Fri, 17 Jun 2022 00:41:52 +0530 Subject: [PATCH 3/7] Fix build problems with protobuf and qt5-multimedia --- azure-jobs.yml | 9 +++++---- msvc-x64-deps.txt | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/azure-jobs.yml b/azure-jobs.yml index 531025b27..3a87ca692 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -159,7 +159,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Release cd Release - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM cmake --build . --config MinSizeRel cmake --install . --config MinSizeRel displayName: 'Release Build' @@ -171,7 +171,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Debug cd Debug - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM cmake --build . --config Debug cmake --install . --config Debug displayName: 'Debug Build' @@ -250,7 +250,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Release cd Release - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM cmake --build . --config MinSizeRel cmake --install . --config MinSizeRel displayName: 'Release Build' @@ -262,7 +262,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Debug cd Debug - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM cmake --build . --config Debug cmake --install . --config Debug displayName: 'Debug Build' @@ -420,3 +420,4 @@ jobs: assetUploadMode: replace isDraft: false isPreRelease: true + diff --git a/msvc-x64-deps.txt b/msvc-x64-deps.txt index 9aeec5280..2aceacb4f 100644 --- a/msvc-x64-deps.txt +++ b/msvc-x64-deps.txt @@ -2,6 +2,7 @@ x64-windows qt5-base qt5-tools +qt5-multimedia qscintilla pugixml rapidjson From e72b49221a5a26227d033547ac0b8f4ddfdcf794 Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Fri, 17 Jun 2022 19:40:25 +0530 Subject: [PATCH 4/7] remove stupid hack --- azure-jobs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-jobs.yml b/azure-jobs.yml index 3a87ca692..a2f05c2f7 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -159,7 +159,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Release cd Release - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM cmake --build . --config MinSizeRel cmake --install . --config MinSizeRel displayName: 'Release Build' @@ -171,7 +171,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Debug cd Debug - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM cmake --build . --config Debug cmake --install . --config Debug displayName: 'Debug Build' @@ -250,7 +250,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Release cd Release - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Release -DCMAKE_BUILD_TYPE=MinSizeRel -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM cmake --build . --config MinSizeRel cmake --install . --config MinSizeRel displayName: 'Release Build' @@ -262,7 +262,7 @@ jobs: cd $(Build.SourcesDirectory)/RadialGM mkdir Debug cd Debug - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=ON -DPROTOBUF_LIBRARY="$(Build.BinariesDirectory)\vcpkg\packages\protobuf_x64-windows\lib\libprotobuf.lib" $(Agent.BuildDirectory)\RadialGM + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=../cmake-package/Debug -DCMAKE_BUILD_TYPE=Debug -DVCPKG_ROOT=$(Build.BinariesDirectory)\vcpkg -DVCPKG_TARGET_TRIPLET=x64-windows -DPROTOBUF_IMPORT_DIRS=$(Build.BinariesDirectory)\vcpkg\installed\x64-windows\include -DCMAKE_TOOLCHAIN_FILE=$(Build.BinariesDirectory)\vcpkg\scripts\buildsystems\vcpkg.cmake $(Agent.BuildDirectory)\RadialGM cmake --build . --config Debug cmake --install . --config Debug displayName: 'Debug Build' From 031b00e6b96813a10297f60a4fe2785a7d227e41 Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Sun, 19 Jun 2022 00:46:32 +0530 Subject: [PATCH 5/7] Hopefully fix MSVC x64 CI. On my VM, putting the Protobuf include before gRPC fixed protobuf linking against .dlls instead of .libs --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc2a2a097..c12c23d26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,15 +241,15 @@ include_directories(${EXE} PRIVATE ${RAPIDJSON_INCLUDE_DIRS}) find_package(yaml-cpp CONFIG REQUIRED) target_link_libraries(${EXE} PRIVATE yaml-cpp) - #Find gRPC - find_package(gRPC CONFIG REQUIRED) - target_link_libraries(${EXE} PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++) - # Find Protobuf include(FindProtobuf) include_directories(${Protobuf_INCLUDE_DIRS}) target_link_libraries(${EXE} PRIVATE ${Protobuf_LIBRARIES}) + #Find gRPC + find_package(gRPC CONFIG REQUIRED) + target_link_libraries(${EXE} PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++) + # Find OpenSSL find_package(OpenSSL REQUIRED) target_link_libraries(${EXE} PRIVATE OpenSSL::SSL OpenSSL::Crypto) From d4f5e566ee948265ac30d298912e10a335406a66 Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Sun, 19 Jun 2022 11:45:58 +0530 Subject: [PATCH 6/7] Update install() to use `GET_PREREQUISITES_VERBOSE` --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c12c23d26..99538c0d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,6 +344,7 @@ if (WIN32) install(CODE " include(BundleUtilities) + set(GET_PREREQUISITES_VERBOSE TRUE) fixup_bundle(\"${RGM_APP}\" \"${LIBS}\" \"${SEARCH_PATHS}\") fixup_bundle(\"${EMAKE_APP}\" \"${LIBS}\" \"${SEARCH_PATHS}\") execute_process(COMMAND windeployqt.exe ${WINDEPLOY_ARGS} ${RGM_APP}) From 471be2478211315aa3ac7026510a011dfabfc549 Mon Sep 17 00:00:00 2001 From: Dhruv Chawla <44582521+dc03@users.noreply.github.com> Date: Fri, 24 Jun 2022 22:36:09 +0530 Subject: [PATCH 7/7] change job names --- azure-jobs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-jobs.yml b/azure-jobs.yml index a2f05c2f7..d997cb20d 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -115,8 +115,8 @@ jobs: assets: | $(Agent.BuildDirectory)/RadialGM-MinGW-$(MINGW_ARCH).exe -- job: MSVC_64_VS_2019 - displayName: 'MSVC x86_64 (Visual Studio 2019)' +- job: MSVC_64_2019 + displayName: 'MSVC 2019 x86_64' ? ${{ if and(eq(parameters.repo, 'self'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) }} : dependsOn: CreateReleaseCandidate pool: @@ -206,8 +206,8 @@ jobs: assets: | $(Agent.BuildDirectory)/RadialGM-MSVC-x86_64.exe -- job: MSVC_64 - displayName: 'MSVC x86_64' +- job: MSVC_64_2022 + displayName: 'MSVC 2022 x86_64' ${{ if and(eq(parameters.repo, 'self'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) }}: dependsOn: CreateReleaseCandidate pool: