Skip to content

Ongoing development #6

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
Merged
merged 47 commits into from
Apr 19, 2021
Merged

Ongoing development #6

merged 47 commits into from
Apr 19, 2021

Conversation

@mrexodia
Copy link
Contributor

@mrexodia mrexodia commented Apr 6, 2021

Supersedes #5

mrexodia added 30 commits March 5, 2021 14:09
@mrexodia
Rename various options to match CMake's naming better and refactor
eaa5e62
@mrexodia
Recursively iterate directories
f929cf5
@mrexodia
Restructure project
173c5e0
@mrexodia
WIP DSL for generating cmake
00969ee
@mrexodia
Add support for include-before and include-after
0e2cddc
@mrexodia
Add inject-before and inject-after
f4ef95e
@mrexodia
Change to vendored dependencies instead of using FetchContent
bd36e67
@mrexodia
Preserve ordering and switch target syntax to use tables
f905440
@mrexodia
Emit add_subdirectory calls after the project but before the targets
ad3869d
@mrexodia
Require a lower CMake version for compatibility with slow distros
a7bdb93
@mrexodia
Support more target_xxx commands
b6d629b
@mrexodia
Improve CMakeLists.txt generation to not touch the file when there ar…
fdd9a3d 
…e no changes
@mrexodia
Minor improvements to property ordering
7828461
@mrexodia
Differentiate between root and subdirectory generation
f9de5c6
@mrexodia
Fix source_group with subdirectories and move add_subdirectory calls …
db4e710 
…to before the targets
@mrexodia
Support inject and include for targets
f32ea49
@mrexodia
Properly quote CMake command arguments with the wrapper
6000629
@mrexodia
Rename inject-after/before to cmake-after/before
028e202
@mrexodia
Automatically generate folder names for subdirs
7f34921
@mrexodia
Move target type handling to an enum for refactor
1e8b756
@mrexodia
Bugfixes
461f26d
@mrexodia
Fix custom target support
d89baa4
@mrexodia
Simplify toml deserialization a lot
206c658
@mrexodia
Add support for project.description and project.languages
105e0aa
@mrexodia
Clean up command generation
5c7f6c9
@mrexodia
Add supporrt for cmkr-include
1af0b5f
@mrexodia
Refactor cmake generation
f2dbd1f
@mrexodia
Fix compilation on Ubuntu
82338cd
@mrexodia
Fix weird compilation bug on latest CMake and Windows
fd307df
@mrexodia
Allow putting cmkr.cmake in a subfolder
af0c42b
mrexodia added 16 commits April 2, 2021 19:08
@mrexodia
Fix path expansion for subdirectories
868d991
@mrexodia
Fix typo in target type enum
c51f9cd
@mrexodia
Generate configure_file for every cmake.toml file
6e48ec7
@mrexodia
Make the first executable the startup project in Visual Studio
555c2d0
@mrexodia
Add error checking for " at the end of injected cmake blocks
8e16352
@mrexodia
Add a hack to hide a warning while bootstrapping on Windows
67ac9a4
@mrexodia
Clean up cmkr bootstrapping
84f6b39
@mrexodia
Recursively bootstrap cmkr.cmake
5c94259
@mrexodia
Breaking change, rename 'cmake.minimum' to 'cmake.version' and make i…
b5752b7 
…t optional
@mrexodia
Initial vcpkg support
5a20c0f
@mrexodia
Respect default members while building
6162e86
@mrexodia
Fix warnings on AppleClang 12
5312b44
@mrexodia
Run GitHub Actions on a bigger matrix
783f343
@mrexodia
Implement stronger type checking for optional values
d62dff2
@mrexodia
Sort globbed files alphabetically for consistent cross-OS generation
598c9b9
@mrexodia
Initial attempt at adding tests
3266470
@mrexodia mrexodia changed the title Currently development branch Ongoing development Apr 6, 2021
@mrexodia mrexodia marked this pull request as draft April 6, 2021 13:06
@mrexodia
Merge remote-tracking branch 'origin/master' into develop
747bc8b 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake.toml
#	include/literals.h
#	src/cmake.cpp
#	src/cmake.hpp
#	src/gen.cpp
@mrexodia mrexodia marked this pull request as ready for review April 19, 2021 14:22
@mrexodia
Copy link
Contributor Author

mrexodia commented Apr 19, 2021 •
edited
Loading

Can this be merged into master? It breaks compatibility with 0.1.4 that is currently out, but I think it's better to break compatibility sooner. I took the liberty to create semver tags for all currently released versions. This way if you want to pin to an older version you can modify CMKR_TAG to v0.1.4 if you want to use that version.

https://github.com/MoAlyousef/cmkr/pull/6/files#diff-c6b2f157ce5228f35d9b82109b146357ab2a8ecc1085733b07a2f1cfc7514ea9R5

@MoAlyousef
Copy link
Contributor

MoAlyousef commented Apr 19, 2021

Yeah sure. Thanks for creating the release tags. I'll merge this to master. Maybe the next release would be a minor bump.

@MoAlyousef MoAlyousef merged commit 7b7b260 into master Apr 19, 2021
@mrexodia mrexodia deleted the develop branch April 24, 2021 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mrexodia @MoAlyousef