Skip to content

Build Windows Release with CMake#60159

Closed
alef wants to merge 341 commits intoCleverRaven:masterfrom
alef:cmake-presets
Closed

Build Windows Release with CMake#60159
alef wants to merge 341 commits intoCleverRaven:masterfrom
alef:cmake-presets

Conversation

@alef
Copy link
Contributor

@alef alef commented Aug 14, 2022 •
edited
Loading

Summary

None

Purpose of change

WARNING: CMake build is NOT official and should be used for dev purposes ONLY.
Use CMake and VCPKG to build a MinGW release, including GitHub Actions.

Describe the solution

  • Raise CMake requirement to v3.21
  • User documentation under doc/COMPILING
  • Branch interactivelty rebased to explain reasons for changes in commits
  • Extends and improve the work done in Align CMake to Visual Studio projects #56875
  • The MinGW build runs under Ubuntu 22.04 and replaces MXE with VCPKG
  • SDL version now dictated by VCPKG
  • The names of the CMake presets are now the same as in release.yml
  • The GHA caches needs optimization. For now, trash them with gh-actions-cache

Describe alternatives you've considered

Same as in #56875

Testing

  • Run command as by doc/COMPILING/COMPILING-CMAKE-VCPKG.md on Windows and Ubuntu.
  • Run cmake.yml under GHA at my account.
    You may prefer disabling it by clicking Actions -> All Workflows: CMake Release -> [...] -> Disable workflow.

Additional context

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON [Markdown] Markdown issues and PRs Code: Build Issues regarding different builds and build environments Code: Tooling Tooling that is not part of the main game but is part of the repo. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 14, 2022
akrieger
akrieger reviewed Aug 28, 2022
View reviewed changes
@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label Aug 29, 2022
onura46 and others added 17 commits August 31, 2022 22:56
@onura46
add post-apoc prices to cannabis extraction items (CleverRaven#60615)
a2b8b17
@onura46
item group changes, remove filter paper recipe (CleverRaven#60616)
5870131
@dseguin
Merge pull request CleverRaven#60471 from mlange-42/toggle-iso-height
3bb8e1e 
Retractable "3D" sprites for walls etc.
@MrDraMaster
[Magiclysm] allow adept weapons as recipe tools (CleverRaven#60633)
d955cf1 
* add technomancer adept weapon as tool alongside normal version

* add magus adept weapon as tool alongside normal version

* add animist adept weapon as tool alongside normal version
@RenechCDDA
Update recipe fields (CleverRaven#60628)
1bd284a
@LyleSY
[DinoMod] dino carriers (CleverRaven#60630)
38b75ae 
* [DinoMod] dino carriers

* add wood variant to innawoods

* revert innawood change

* Create recipe_others.json

* spawn in dino locations

* Update pets.json

* Update pets.json

* Update pets.json
@TheShadowFerret
Nested Recipes-Misc. ammo & components (CleverRaven#60617)
0095733 
* Nested-Misc ammo & components

* Typo
@Sathra225
Update modular_workshop_recipe_groups.json (CleverRaven#60582)
dfb72d0 
quality steel and steel products for modular workshop
@irwiss
Add casts and widen a variable to make MSVC happy (CleverRaven#60568)
7922273
@n0pen
Allow wearing non-covering items with power armor (CleverRaven#60533)
ef92ebd 
Currently the game will not allow any item incompatible with power armor
Non-covering items should be allowed as they don't obstruct power armor

Co-authored-by: nopen <nopen>
@Venera3
Snap (CleverRaven#60602)
0c6b34c 
Co-authored-by: Venera3 <Venera3@users.noreply.github.com>
@Rivet-the-Zombie
Merge pull request CleverRaven#60618 from dseguin/app_unplug_opt
5510799 
Appliance: option to unplug power connections
@Nerezza
Bionic power supply tool mod (CleverRaven#57501)
d68bfb9 
* Add toolmod to power devices with bionic power.

* fixzes more whitespace.

* Doublespaced the period
@Cimanyd0
Update wrapped radiation badge (CleverRaven#59002)
293a66f 
Change wrapped radiation badge to match (unwrapped) radiation badge
@RedMisao
Documentation: Added the USE_PLAYER_ENERGY flag from existing code (C…
fe8ca70 
…leverRaven#60180)

* Update JSON_FLAGS.md

* Update JSON_FLAGS.md
@Karol1223
Aluminum Revolution 3: The Oxide Returns (CleverRaven#60635)
89e1f92 
* Update recipe_deconstruction.json

* Update furniture-tools.json

* Update furniture-tools.json

* Update recipe_deconstruction.json

* Update recipe_deconstruction.json

* Update recipe_vehicle.json

* Update parts.json

* Update frames.json

* Update vehicle_parts.json
@dseguin
Appliance: drop cables when taking down appliance (CleverRaven#60621)
7e5f5bf 
* Fix: shed loose connections when taking down appliance

* Fix: don't count fake parts when choosing to remove vehicle
alef and others added 15 commits September 10, 2022 18:37
@alef
Do not use our Find* modules under VCPKG
6b50145
@alef
Move VsDevCmd environment parsing to its dedicated script
24f169b
@alef
Fix checking for DevEnvDir
94cedd6
@alef
Fix parsing non variables output
5c327d8
@alef
Document and improve VsDevCmd.cmake
feb7f3d 
It uses DOS short names to workaround a CMake issue.
@alef
Add a "release" preset and others to inherit from
c93cc74
@alef
Add sound to MSVC build
7ee471b
@alef
Cosmetic changes
78f81ff
@alef
Set compiler launchers before adding subdirectories
c799473
@alef
Add the missing dbghelp for BACKTRACE
5291d6f
@alef
Use same optimization for size and debug level as in actual release
88f4ae2 
Add builtin crc32 to silence reduntant-decls
@alef @akrieger
Fix "/permessive" description
8101e16 
Co-authored-by: akrieger <akrieger@users.noreply.github.com>
@alef
Use vswhere.exe as suggested by @akrieger
d3ddbec
@alef
Remove unneded 'sdl2-image' and comments
ad4c7f9
@alef
Merge branch 'cmake-presets' of github.com:alef/Cataclysm-DDA into cm…
8ae6d68 
…ake-presets
@akrieger
Copy link
Member

akrieger commented Sep 10, 2022

Something seems to have gone poorly with the last push.

@alef alef marked this pull request as draft September 10, 2022 19:49
@alef alef closed this Sep 10, 2022
@alef
Copy link
Contributor Author

alef commented Sep 10, 2022 •
edited
Loading

Something seems to have gone poorly with the last push.

Yes, I am closing this. Will try to make smaller PR in the future. Thanks for the review, I have took note of your comments.

@alef alef mentioned this pull request Sep 24, 2022
Merged
3 tasks
@alef alef mentioned this pull request Oct 23, 2022
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akrieger akrieger akrieger left review comments

@dseguin dseguin Awaiting requested review from dseguin

@BrettDong BrettDong Awaiting requested review from BrettDong

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

@Night-Pryanik Night-Pryanik Awaiting requested review from Night-Pryanik

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

@I-am-Erk I-am-Erk Awaiting requested review from I-am-Erk

@LyleSY LyleSY Awaiting requested review from LyleSY

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@Mom-Bun Mom-Bun Awaiting requested review from Mom-Bun

Assignees

No one assigned

Labels

astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Code: Build Issues regarding different builds and build environments Code: Tooling Tooling that is not part of the main game but is part of the repo. <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.