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

Fix: call vcvars for clang-cl as well #3832

Merged
merged 1 commit into from
Oct 26, 2018
Merged

Fix: call vcvars for clang-cl as well #3832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions conans/client/build/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,10 @@ def get_dir(folder, origin):

def _run(self, command):
compiler = self._settings.get_safe("compiler")
if compiler == 'Visual Studio' and self.generator in ['Ninja', 'NMake Makefiles',
'NMake Makefiles JOM']:
the_os = self._settings.get_safe("os")
is_clangcl = the_os == 'Windows' and compiler == 'clang'
is_msvc = compiler == 'Visual Studio'
if (is_msvc or is_clangcl) and self.generator in ['Ninja', 'NMake Makefiles', 'NMake Makefiles JOM']:
with tools.vcvars(self._settings, force=True, filter_known_paths=False):
self._conanfile.run(command)
else:
Expand Down
18 changes: 12 additions & 6 deletions conans/test/build_helpers/cmake_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,13 +1089,19 @@ def scape(args):
pattern = "%s" if sys.platform == "win32" else r"'%s'"
return ' '.join(pattern % i for i in args.split())

@parameterized.expand([('Ninja',), ('NMake Makefiles',), ('NMake Makefiles JOM',)])
def test_vcvars_applied(self, generator):
@parameterized.expand([('Ninja', 'Visual Studio', 15),
('NMake Makefiles', 'Visual Studio', 15),
('NMake Makefiles JOM', 'Visual Studio', 15),
('Ninja', 'clang', 6.0),
('NMake Makefiles', 'clang', 6.0),
('NMake Makefiles JOM', 'clang', 6.0)
])
def test_vcvars_applied(self, generator, compiler, version):
conanfile = ConanFileMock()
settings = Settings.loads(default_settings_yml)
settings.os = "Windows"
settings.compiler = 'Visual Studio'
settings.compiler.version = 15
settings.compiler = compiler
settings.compiler.version = version
conanfile.settings = settings

cmake = CMake(conanfile, generator=generator)
Expand All @@ -1104,13 +1110,13 @@ def test_vcvars_applied(self, generator):
vcvars_mock.__enter__ = mock.MagicMock(return_value=(mock.MagicMock(), None))
vcvars_mock.__exit__ = mock.MagicMock(return_value=None)
cmake.configure()
self.assertTrue(vcvars_mock.called)
self.assertTrue(vcvars_mock.called, "vcvars weren't called")

with mock.patch("conans.tools.vcvars") as vcvars_mock:
vcvars_mock.__enter__ = mock.MagicMock(return_value=(mock.MagicMock(), None))
vcvars_mock.__exit__ = mock.MagicMock(return_value=None)
cmake.build()
self.assertTrue(vcvars_mock.called)
self.assertTrue(vcvars_mock.called, "vcvars weren't called")


class ConanFileMock(ConanFile):
Expand Down