Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve cmake config for Windows and Visual Studio #10361

Merged
merged 1 commit into from
Jan 25, 2020
Merged

Improve cmake config for Windows and Visual Studio #10361

merged 1 commit into from
Jan 25, 2020

Conversation

IntelOrca
Copy link
Contributor

@IntelOrca IntelOrca commented Dec 12, 2019 •
edited
Loading

  • Ensure static CRT is used when compiling.
  • Allow Ninja generator to work (remove use of CMAKE_VS_PLATFORM_NAME).
  • Move CMakeSettings.json to new standard location for VS.

Issues still remaining (not to be done for this PR):

  • No support for getting discord-rpc via find_library (vcpkg).
  • Build errors when using -DWITH_TESTS
  • install target is far too geared towards unix and does not lay out our current portable distributed zip.

janisozaur
janisozaur requested changes Dec 12, 2019
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
CMakeSettings.json Show resolved Hide resolved
@IntelOrca
Improve cmake config for Windows and Visual Studio
32ec4e2 
- Ensure static CRT is used when compiling.
- Allow Ninja generator to work (remove use of CMAKE_VS_PLATFORM_NAME).
- Move CMakeSettings.json to new standard location for VS.
@IntelOrca IntelOrca merged commit 5925d5f into OpenRCT2:develop Jan 25, 2020
XplosiveLugnut pushed a commit to XplosiveLugnut/OpenRCT2 that referenced this pull request Apr 27, 2020
@IntelOrca
Improve cmake config for Windows and Visual Studio (OpenRCT2#10361)
074812d 
- Ensure static CRT is used when compiling.
- Allow Ninja generator to work (remove use of CMAKE_VS_PLATFORM_NAME).
- Move CMakeSettings.json to new standard location for VS.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janisozaur janisozaur janisozaur requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@IntelOrca @janisozaur