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.

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

Arranging master CMake #138

Merged
merged 7 commits into from
Jan 12, 2022
Merged

Arranging master CMake #138

merged 7 commits into from
Jan 12, 2022

Conversation

MatthiasWM
Copy link
Collaborator

No description provided.

@ekoeppen
Copy link
Collaborator

Since you're rearranging a larger amount of stuff, could you also fix at the same time the mixed indentation in the files you're updating (I suppose Einstein uses hard tabs with an indentation of four)? My vim will thank you for succeeding in autodetecting the indentation style :)

@MatthiasWM
Copy link
Collaborator Author

Yes, definitely. Do you want tabs or spaces in CMake files? If spaces, which depth? Vi uses tabs at four spaces IIRC.

CMake resets all indentation setting when processing a modification in any of the CMake file which is driving me nuts TBH.

@ekoeppen
Copy link
Collaborator

Yes, definitely. Do you want tabs or spaces in CMake files? If spaces, which depth? Vi uses tabs at four spaces IIRC.

CMake resets all indentation setting when processing a modification in any of the CMake file which is driving me nuts TBH.

It does look like the rest of the code is hard tabs with indentation of 4, does CMake work with that? If not, we can also use whatever CMake does, vim should ideally be configured so that it autodetects that (at least that's what I have, but it breaks when the style is mixed).

@MatthiasWM
Copy link
Collaborator Author

I will reindent all files, CMake or code, to 4 spaces wide hard tabs. I have three projects with three different indentation schemes, and Xcode couldn't care less.

@MatthiasWM
Copy link
Collaborator Author

LGTM will continue to time out building the master branch, so lets make this the master and hope for the best. CodeQL is now happy at last.

@MatthiasWM MatthiasWM merged commit 5a1df72 into master Jan 12, 2022
@MatthiasWM MatthiasWM deleted the cmake branch January 12, 2022 18:26
@pguyot
Copy link
Owner

pguyot commented Jan 15, 2022

I will reindent all files, CMake or code, to 4 spaces wide hard tabs. I have three projects with three different indentation schemes, and Xcode couldn't care less.

I missed that comment and checked in a .editorconfig that puts spaces in CMakeLists.txt files.
Please feel free to fix that in either CMakeLists.txt files or .editorconfig.

Also, what is CMakeLists.new.txtfor? Can we remove it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants