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

Feature/msvc msbuild #8238

Merged
merged 40 commits into from Jan 18, 2021
Merged

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Dec 20, 2020

Changelog: Feature: Provide support for msvc compiler in MSBuild tools
Docs: conan-io/docs#1991

Follow up of #8201, to provide support for msvc compiler in MSBuild tools

Same initial experimental support, just extending it for tools.microsoft (it was only for CMake):

  • No support for intel yet
  • No older visual studio versions. No validation of versions.
  • Using the new conf core.package_id:msvc_visual_compatible in new conan.cfg
  • Some refactors, decoupling logic of toolsets from the old build helpers, so we can change things without breaking.

@memsharded memsharded added this to the 1.33 milestone Dec 20, 2020
@memsharded memsharded marked this pull request as ready for review January 15, 2021 00:33
memsharded and others added 2 commits January 18, 2021 17:16
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Erlkoenig90 and others added 8 commits January 18, 2021 17:30
…determine -rpath separator (conan-io#7716)

* Fix conan-io#7715, in rpath_flags use host OS instead of build OS to determine the separator for the ld -rpath flag which is neccessary for cross-compiling to Mac OS

* For conan-io#7715, don't pass os_host to rpath_flags but extract from settings, pass os_build again and only set rpath_separator to , if compiling for Mac OS from Linux or Mac OS via GCC_LIKE

* Fix test_compiler_args for cross-compiling Mac OS X -> Linux

* Update conans/client/build/compiler_flags.py

Co-authored-by: SSE4 <tomskside@gmail.com>

* Update conans/client/build/compiler_flags.py

Co-authored-by: SSE4 <tomskside@gmail.com>

* Update conans/test/unittests/client/generators/compiler_args_test.py

* Update conans/client/build/compiler_flags.py

* Use -rpath, in all tests for all platforms

* fixing tests

Co-authored-by: James <james@conan.io>
Co-authored-by: SSE4 <tomskside@gmail.com>
…o#8338)

* use target without namespace

* add marks

* use target from the build-module

* remove line

* build-module per generator

* revert changes in build_info

* make it explicit it is PATH

* even without build-type, compiler.runtime is different for Release/Debug

* use x64 for Windows generator
@memsharded memsharded merged commit 040a556 into conan-io:develop Jan 18, 2021
@memsharded memsharded deleted the feature/msvc_msbuild branch January 18, 2021 17:21
@@ -138,7 +136,7 @@ def package_info(self):
pc_path = os.path.join(client.current_folder, "MyLib.pc")
self.assertTrue(os.path.exists(pc_path))
pc_content = load(pc_path)
self.assertIn("-Wl,-rpath=\"${libdir}\"", pc_content)
self.assertIn("-Wl,-rpath,\"${libdir}\"", pc_content)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes, was it a bug? Maybe this is worth an entry in the changelog.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was another PR for this issue, not this one, I am surprised this is here, need to check.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR https://github.com/conan-io/conan/pull/7716/files contains this change, and this was merged to develop, and this PR merged develop, so I think it might be a glitch of Github diff

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants