Fix BUILD_CLONE_SUBMODULES CMake config option #76
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
…garw13/coreMQTT into update-cmake-submodule-option
yourslab
previously approved these changes
Sep 28, 2020
sarenameas
reviewed
Sep 28, 2020
test/unit-test/cmock_build.cmake
Outdated
| @@ -3,7 +3,7 @@ macro( clone_cmock ) | |||
| find_package( Git REQUIRED ) | |||
| message( "Cloning submodule CMock." ) | |||
| execute_process( COMMAND rm -rf ${CMOCK_DIR} | |||
| COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive ${CMOCK_DIR} | |||
| COMMAND ${GIT_EXECUTABLE} submodule update checkout --init --recursive ${CMOCK_DIR} | |||
There was a problem hiding this comment.
Does this need to be --checkout?
There was a problem hiding this comment.
If we take out the clone you added to the ci.yml, we could test this?
There was a problem hiding this comment.
Does this need to be --checkout?
Yes, that is how the update = none option is overriden
There was a problem hiding this comment.
If we take out the clone you added to the ci.yml, we could test this?
Sure
sarenameas
approved these changes
Sep 28, 2020
aggarg
approved these changes
Sep 29, 2020
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.
With submodule configuration changes made in #75, the
BUILD_CLONE_SUBMODULESCMake config became disfynctional (as it uses thegit submodule update --recursivecommand).This PR updates the CMake logic to use
git submodule update --checkout --initcommand to fix the CMake config option.Also, this PR changes the default value of
BUILD_CLONE_SUBMODULESto beOFFto avoid always auto-cloning the CMock submodule.