Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake.toml
#	include/literals.h
#	src/cmake.cpp
#	src/cmake.hpp
#	src/gen.cpp
vcpkg-wip
Duncan Ogilvie 4 years ago
commit 747bc8be00

@ -1,5 +1,10 @@
# CHANGELOG # CHANGELOG
## 0.1.4 - 2021-04-11
- Use `GIT_SHALLOW ON` by default when getting git dependencies.
- Add cmake.description field.
- Change bin.defines to bin.definitions.
## 0.1.3 - 2020-11-27 ## 0.1.3 - 2020-11-27
- Support building with C++11. - Support building with C++11.
- @mrexodia implemented CMake integration and bootstrapping. - @mrexodia implemented CMake integration and bootstrapping.

@ -35,7 +35,8 @@ minimum = "3.15"
[project] [project]
name = "cmkr" name = "cmkr"
version = "0.1.3" version = "0.1.4"
description = "CMakeLists generator from TOML"
[fetch-content] [fetch-content]
toml11 = { git = "https://github.com/ToruNiina/toml11" } toml11 = { git = "https://github.com/ToruNiina/toml11" }
@ -65,6 +66,7 @@ Currently supported fields:
```toml ```toml
[cmake] # required for top-level project [cmake] # required for top-level project
minimum = "3.15" # required minimum = "3.15" # required
description = "" # optional
subdirs = [] # optional subdirs = [] # optional
build-dir = "build" # optional build-dir = "build" # optional
cpp-flags = [] # optional cpp-flags = [] # optional

@ -8,7 +8,7 @@ if(CMAKE_BUILD_TYPE)
endif() endif()
""" """
name = "cmkr" name = "cmkr"
version = "0.1.3" version = "0.1.4"
description = "CMakeLists generator from TOML" description = "CMakeLists generator from TOML"
languages = ["CXX"] languages = ["CXX"]
subdirs = ["third_party", "tests"] subdirs = ["third_party", "tests"]

Loading…
Cancel
Save