Merge develop2 to release branch #12515
Merged
Conversation
This file contains hidden or 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
* fix autotools install on Windows * extend win_bash/Autotools test with autotools installation * install in build() since test runs discrete commands Co-authored-by: memsharded <[email protected]>
…#12464) * Stop mutating CMAKE_PREFIX_PATH in config file generated by CMakeDeps * Update conans/test/functional/toolchains/cmake/test_cmake_toolchain.py Co-authored-by: James <[email protected]> * Update conans/test/functional/toolchains/cmake/test_cmake_toolchain.py Co-authored-by: James <[email protected]> * Fix package ID logic * Use modern copy * Update conans/test/functional/toolchains/cmake/test_cmake_toolchain.py Co-authored-by: James <[email protected]> Co-authored-by: Carlos Zoido <[email protected]>
* xcrun settings * xcrun settings * xcrun settings
* test cli_args * add cli_args
* wip * fix test
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.
Merge without squash