Skip to content

CMake: Clean up if commands and fix compilation with MSYS ncurses#56799

Merged
ZhilkinSerg merged 2 commits intoCleverRaven:masterfrom
Qrox:cmake
Apr 16, 2022
Merged

CMake: Clean up if commands and fix compilation with MSYS ncurses#56799
ZhilkinSerg merged 2 commits intoCleverRaven:masterfrom
Qrox:cmake

Conversation

@Qrox
Copy link
Copy Markdown
Contributor

@Qrox Qrox commented Apr 14, 2022

Summary

Build "CMake: Clean up if commands and fix compilation with MSYS ncurses"

Purpose of change

CMake if command expands unquoted string if it happens to be a variable name, which may cause quirks during compilation.

Also fixes compilation with MSYS ncurses.

Describe the solution

Quote string in if commands where appropriate.

Define some macros to use the correct ncurses lib version.

Fix installation directory error from CMake by setting directory paths to those used for Windows when compiling with MSYS ncurses.

Testing

Successfully compiled using CMake and MinGW-w64 or MSYS2 MSYS.

@Qrox Qrox requested a review from BrettDong as a code owner April 14, 2022 16:54
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. Translation I18n 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 Apr 14, 2022
@ZhilkinSerg ZhilkinSerg merged commit adc3c70 into CleverRaven:master Apr 16, 2022
@Qrox Qrox deleted the cmake branch April 17, 2022 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. json-styled JSON lint passed, label assigned by github actions Translation I18n

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants