fix applying generator_platform based on version instead of actual generator #7684
Conversation
| @@ -202,7 +202,7 @@ def cmake_generator_intel_test(self): | |||
| conanfile.settings = settings | |||
|
|
|||
| cmake = CMake(conanfile) | |||
| self.assertIn('-G "Visual Studio 15 2017" -A "x64"', cmake.command_line) | |||
| self.assertIn('-G "Visual Studio 15 2017 Win64"', cmake.command_line) | |||
There was a problem hiding this comment.
This seemed a bug, that it was using the Intel compiler version (19), instead of the actual CMake generator version
memsharded
force-pushed
the
fix/cmake_generator_arch
branch
from
5db0480
to
42bc73e
Compare
| # the -A argument to keep previous implementation, but any modern CMake will support | ||
| # (and recommend) passing the platform in its own argument. | ||
| # Get the version from the generator, as it could have been defined by user argument | ||
| compiler_version = re.search("Visual Studio ([0-9]*)", generator).group(1) |
There was a problem hiding this comment.
I can see the same pattern in the _build method, do we need the same change there?
There was a problem hiding this comment.
Yes, it was extremely unlikely, because it meant using VS 9 2008, but I have changed it too, and added a check in the test.
There was a problem hiding this comment.
I was referring to line ~320 (inside the function _build()):
compiler_version = self._settings.get_safe("compiler.version")
I think it would be enough to substitute that line with this same regex
There was a problem hiding this comment.
Not a oneliner, because if the generator is not "Visual Studio", the group() call will raise NoneType. As it is only used for Visual generator, I moved it down to the correct place. I forgot to remove this unused line, I have just fixed it.
There was a problem hiding this comment.
LGTM
I think it can be simplified #7684 (comment), but that can wait for a refactor.
Yes, I had refactored it, but reverted the refactor as I prefer to keep the changes minimal. |
Changelog: Bugfix: CMake build helper: Use actual CMake generator version to append platform generator, instead of the Conan setting
compiler.version.Docs: Omit
Close #7683