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.

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

Revert CMake default generator on Windows #4509

Merged

Conversation

@uilianries
Copy link
Member

@uilianries uilianries commented Feb 12, 2019

Changelog: Fix: Revert default cmake generator on Windows (#4265)
Docs: conan-io/docs#1072
Related comment: conan-io/docs#1026 (comment)

Since this change is related to CMake, all platforms should be tested, including slow tests

@PYVERS: Macos@py27, Windows@py36, Linux@py27, py34
@tags: slow

Hi!

As @danimtb commented before, the feature #4265 solved a problem on Windows, but now it causes a new problem when mingw is not installed. This PR reverts the previous change and show an warning message when a generator is not detected.

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

@uilianries
Copy link
Member Author

@uilianries uilianries commented Feb 12, 2019

Copy link
Member

@danimtb danimtb left a comment

❗️ This PR should be re-targeted to the release branch once it is open

@danimtb
Copy link
Member

@danimtb danimtb commented Feb 13, 2019

In order to improve the error message described in #4265, I think we should raise an exception with a meaningful message and it should be part of this PR

conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
@danimtb danimtb requested a review from memsharded Feb 13, 2019
@danimtb danimtb assigned danimtb and unassigned uilianries Feb 13, 2019
@lasote lasote dismissed danimtb’s stale review Feb 13, 2019

More checks needed

@ghost ghost assigned uilianries Feb 13, 2019
@uilianries
Copy link
Member Author

@uilianries uilianries commented Feb 15, 2019

Much better! Thanks @danimtb !

@danimtb
Copy link
Member

@danimtb danimtb commented Feb 15, 2019

Pushed some commits with the following changes:

  • Test reproducing issue on #42605.
  • Changed warning log message.
  • Output warning message in CMake build helper when generator cannot be deduced (at instantiation time).
  • Modified header only test with asserts on new message and generator

This changes should complete the fix @uilianries, thanks for the initial work!

@danimtb danimtb requested a review from jgsogo Feb 15, 2019
@danimtb danimtb added this to the 1.12.3 milestone Feb 15, 2019
@danimtb
Copy link
Member

@danimtb danimtb commented Feb 15, 2019

After CI turns green, I will re-target this to the 1.12.3 release branch

@danimtb danimtb force-pushed the hotfix/default-win-compiler branch from 96b444d to 3d95f51 Feb 18, 2019
@danimtb danimtb changed the base branch from develop to release/1.12.3 Feb 18, 2019
@danimtb
Copy link
Member

@danimtb danimtb commented Feb 18, 2019

Re-targeted to 1.12.3 release branch!

@danimtb danimtb assigned memsharded and unassigned danimtb Feb 18, 2019
Copy link
Member

@memsharded memsharded left a comment

Good! Can be merged!

@memsharded memsharded merged commit d8a31f7 into conan-io:release/1.12.3 Feb 18, 2019
2 checks passed
@ghost ghost removed the stage: review label Feb 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants