Skip to content
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

Remove CMAKE_PROJECT_INCLUDE in CMakeToolchain #8251

Merged
merged 22 commits into from Dec 23, 2020
Merged

Remove CMAKE_PROJECT_INCLUDE in CMakeToolchain #8251

merged 22 commits into from Dec 23, 2020

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Dec 22, 2020 •
edited

Changelog: Fix: Remove CMAKE_PROJECT_INCLUDE in CMakeToolchain, no longer necessary as the MSVC runtime can be defined with a generator expression in the toolchain.
Docs: Omit

Docs were not referencing this feature at all.

Extracted from #8201, processing the MSVC runtime directly in the toolchain works, no need for a CMAKE_PROJECT_INCLUDE file

@memsharded
working in msvc new settings
0a6f828
@memsharded
merged develop
27c6fc4
@memsharded
preliminary support for msvc compiler
72f6bee
@memsharded
fix migration
369143b
@memsharded
changing to version 19.1, 19.11, etc
fb110ba
@memsharded
merged develop
ee99a73
@memsharded
working on static/dynamic runtime
cfc28fe
@memsharded
Merge branch 'develop' into feature/msvc
c55072f
@memsharded
extracting toolchain checkers to use in CMake
b245c43
@memsharded
removed unused import
c363312
@memsharded
adding checks
fb6b57b
@memsharded
adding check
e98d911
@memsharded
Merge branch 'feature/toolchain_checkers' into feature/msvc
ae91af5
@memsharded
first proposal
3c3a7b3
@memsharded
msvc proposal for runtime
3bb3e4d
@memsharded
fix migration test
ef36fd2
@memsharded
fixing tests
2000c85
@memsharded
binary compatibility
640b134
@memsharded
merged develop
fca3c79
@memsharded
Merge branch 'develop' into feature/msvc
1110c80
@memsharded
Merge branch 'develop' into feature/msvc
e9df343
@memsharded
removing cmake_project_include, msvc runtime with generator expressions
06bb84f
@memsharded memsharded marked this pull request as ready for review December 22, 2020 21:41
@memsharded memsharded added this to the 1.33 milestone Dec 22, 2020
@jgsogo jgsogo merged commit 28599c8 into conan-io:develop Dec 23, 2020
@memsharded memsharded deleted the feature/msvc_runtime branch December 23, 2020 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jgsogo jgsogo jgsogo approved these changes

Assignees

@jgsogo jgsogo

Labels
None yet
Projects
None yet
Milestone
1.33
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@memsharded @jgsogo