Skip to content

[glog] Glog nominmax#24538

Merged
ras0219-msft merged 5 commits intomicrosoft:masterfrom
whuaegeanse:glog-nominmax
Jun 6, 2022
Merged

[glog] Glog nominmax#24538
ras0219-msft merged 5 commits intomicrosoft:masterfrom
whuaegeanse:glog-nominmax

Conversation

@whuaegeanse
Copy link
Contributor

Describe the pull request
Fixs conflicts with freeimage when building colmap.

@ZZWang21
Copy link

ZZWang21 commented May 4, 2022

I ran " ./vcpkg x-add-version --all", and got this:
"Error: Local changes detected for glog but no changes to version or port version.
-- Version: 0.5.0#3
-- Old SHA: 6f706ab
-- New SHA: ecb04a5ba4d046af782f62ae7c167bd05b0101a8
-- Did you remember to update the version or port version?
-- Pass --overwrite-version to bypass this check.
No files were updated."

@Hyunkil76
Copy link

Hyunkil76 commented May 4, 2022

I changed files like [cad3645], [3b48bd2] and after run .\vcpkg x-add-version --all
But I also got warning.....
C:\colmap\vcpkg>.\vcpkg x-add-version --all
Warning: Local port files SHA is the same as version 0.5.0#3 in C:\colmap\vcpkg\versions\g-\glog.json.
-- SHA: ecb04a5ba4d046af782f62ae7c167bd05b0101a8
-- Did you remember to commit your changes?
No files were updated.

@ZZWang21
Copy link

ZZWang21 commented May 4, 2022

My build failed again. And, the vcpkg document has been over 60Gb large. Is it possible? Or anything went wrong?

@ZZWang21
Copy link

ZZWang21 commented May 4, 2022

I rebooted the computer. re-build again. Now it seems to be finished. 1.13 hours was used.

@ZZWang21
Copy link

ZZWang21 commented May 4, 2022

I have installed COLMAP with vcpkg. Do I need to cmake for COLMAP? I planned to install Pycolmap, but I cannot. Got many errors.

@whuaegeanse whuaegeanse changed the title Glog nominmax [glog] Glog nominmax May 5, 2022
@Adela0814 Adela0814 added the category:port-bug The issue is with a library, which is something the port should already support label May 5, 2022
@Adela0814
Copy link
Contributor

I changed files like [cad3645], [3b48bd2] and after run .\vcpkg x-add-version --all But I also got warning..... C:\colmap\vcpkg>.\vcpkg x-add-version --all Warning: Local port files SHA is the same as version 0.5.0#3 in C:\colmap\vcpkg\versions\g-\glog.json. -- SHA: ecb04a5ba4d046af782f62ae7c167bd05b0101a8 -- Did you remember to commit your changes? No files were updated.

you need to overwrite the version via .\vcpkg x-add-version glog --overwrite-version

@Adela0814
Copy link
Contributor

@whuaegeanse are you trying to fix the CI build issue? you can get the failure logs from https://dev.azure.com/vcpkg/public/_build/results?buildId=71684&view=artifacts&pathAsName=false&type=publishedArtifacts

@Hyunkil76
Copy link

Hyunkil76 commented May 5, 2022

I run '.\vcpkg x-add-version glog --overwrite-version'. But same waring occured. I attach files what I changed. Is there a problem with that?? Or I have to do more things after change them and before run x-add-version?

I'm using Windows 10x64 and MSVC19

Thank so much for your help

(base) C:\colmap\vcpkg>.\vcpkg x-add-version glog --overwrite-version
Warning: Local port files SHA is the same as version 0.5.0#3 in C:\colmap\vcpkg\versions\g-\glog.json.
-- SHA: ecb04a5ba4d046af782f62ae7c167bd05b0101a8
-- Did you remember to commit your changes?
*No files were updated.
changed.zip
*

@whuaegeanse
Copy link
Contributor Author

@whuaegeanse are you trying to fix the CI build issue? you can get the failure logs from https://dev.azure.com/vcpkg/public/_build/results?buildId=71684&view=artifacts&pathAsName=false&type=publishedArtifacts

I am working on this

@Adela0814 Adela0814 mentioned this pull request May 19, 2022
@Adela0814 Adela0814 linked an issue May 19, 2022 that may be closed by this pull request
@Adela0814
Copy link
Contributor

@whuaegeanse are you trying to fix the CI build issue? you can get the failure logs from https://dev.azure.com/vcpkg/public/_build/results?buildId=71684&view=artifacts&pathAsName=false&type=publishedArtifacts

I am working on this

What's the status now?

@whuaegeanse whuaegeanse marked this pull request as ready for review June 2, 2022 10:03
@whuaegeanse
Copy link
Contributor Author

@Adela0814 Done.

@Adela0814 Adela0814 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jun 6, 2022
@ras0219-msft
Copy link
Contributor

Thanks for the fix!

@ras0219-msft ras0219-msft merged commit fdeea72 into microsoft:master Jun 6, 2022
@whuaegeanse whuaegeanse deleted the glog-nominmax branch June 7, 2022 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Windows] Build error [colmap] Build error

5 participants