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

adding preprocessor defintiions to MSBuildTolchain ResourceCompile #9843

Merged
merged 1 commit into from
Oct 22, 2021
Merged

adding preprocessor defintiions to MSBuildTolchain ResourceCompile #9843

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion conan/tools/microsoft/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ def format_macro(key, value):
<RuntimeLibrary>{}</RuntimeLibrary>
<LanguageStandard>{}</LanguageStandard>{}
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>
{};%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<PropertyGroup Label="Configuration">
<PlatformToolset>{}</PlatformToolset>
Expand All @@ -150,7 +155,7 @@ def format_macro(key, value):
compile_options = "".join("\n <{k}>{v}</{k}>".format(k=k, v=v)
for k, v in self.compile_options.items())
config_props = toolchain_file.format(preprocessor_definitions, runtime_library, cppstd,
compile_options, toolset)
compile_options, preprocessor_definitions, toolset)
config_filepath = os.path.join(self._conanfile.generators_folder, config_filename)
self._conanfile.output.info("MSBuildToolchain created %s" % config_filename)
save(config_filepath, config_props)
Expand Down
37 changes: 37 additions & 0 deletions conans/test/unittests/tools/microsoft/test_msbuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,43 @@ def test_msbuild_standard():
assert '<LanguageStandard>stdcpp20</LanguageStandard>' in load(props_file)


def test_resource_compile():
test_folder = temp_folder()

settings = Settings({"build_type": ["Release"],
"compiler": {"msvc": {"version": ["19.3"], "cppstd": ["20"]}},
"os": ["Windows"],
"arch": ["x86_64"]})
conanfile = ConanFile(Mock(), None)
conanfile.folders.set_base_generators(test_folder)
conanfile.install_folder = test_folder
conanfile.conf = ConfDefinition()
conanfile.settings = "os", "compiler", "build_type", "arch"
conanfile.settings_build = settings
conanfile.initialize(settings, EnvValues())
conanfile.settings.build_type = "Release"
conanfile.settings.compiler = "msvc"
conanfile.settings.compiler.version = "19.3"
conanfile.settings.compiler.cppstd = "20"
conanfile.settings.os = "Windows"
conanfile.settings.arch = "x86_64"

msbuild = MSBuildToolchain(conanfile)
msbuild.preprocessor_definitions["MYTEST"] = "MYVALUE"
props_file = os.path.join(test_folder, 'conantoolchain_release_x64.props')
with mock.patch("conan.tools.microsoft.visual.vcvars_path", mock.MagicMock(return_value=".")):
msbuild.generate()
expected = """
<ResourceCompile>
<PreprocessorDefinitions>
MYTEST=MYVALUE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ResourceCompile>"""
props_file = load(props_file) # Remove all blanks and CR to compare
props_file = "".join(s.strip() for s in props_file.splitlines())
assert "".join(s.strip() for s in expected.splitlines()) in props_file


@pytest.mark.parametrize("mode,expected_toolset", [
("icx", "Intel C++ Compiler 2021"),
("dpcpp", "Intel(R) oneAPI DPC++ Compiler"),
Expand Down