Update/cleanup cmake files #579
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rettichschnidi
approved these changes
Apr 6, 2021
| @@ -7,15 +7,18 @@ include(${CMAKE_CURRENT_LIST_DIR}/../coap/coap.cmake) | |||
| include(${CMAKE_CURRENT_LIST_DIR}/../data/data.cmake) | |||
| include(${CMAKE_CURRENT_LIST_DIR}/../examples/shared/shared.cmake) | |||
|
|
|||
| add_definitions(-DLWM2M_CLIENT_MODE -DLWM2M_SUPPORT_TLV -DLWM2M_SUPPORT_JSON) | |||
| add_compile_definitions(LWM2M_CLIENT_MODE) | |||
There was a problem hiding this comment.
I like the idea of using multiple lines.
|
FYI: This will conflict with PR #576. One of us will have to rebase. |
| @@ -1,4 +1,4 @@ | |||
| cmake_minimum_required(VERSION 2.8) | |||
| cmake_minimum_required(VERSION 3.13) | |||
There was a problem hiding this comment.
Suggested change
| cmake_minimum_required(VERSION 3.13) | |
| cmake_minimum_required (VERSION 3.13) |
There was a problem hiding this comment.
For consistency reasons - it has this space everywhere else too. But really not important, which is why have approved the PR anyway.
|
Could you rebase on master ? 🙏 |
- Replace redundant WITH_LOG since it was only rarely used and we have LWM2M_WITH_LOG. - Replace add_definitions with modern alternatives. - Set a common minimal required cmake version. Signed-off-by: Marc Lasch <[email protected]>
Signed-off-by: Marc Lasch <[email protected]>
mlasch
force-pushed
the
gardena/ml/cleanup-cmake-definitions
branch
from
4055361 to
8f10a8b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a pre-work/cleanup to make the CoAP block-size configurable during build time (via cmake variable) in a future PR.
I bumped the cmake version in all files to 3.13 to support all required features and to be consistent (3.13 is currently available in Debian stable, so still quite conservative). Also tried to make the formatting a bit more homogeneous.