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

Feature/msvc msbuild #8238

Merged
merged 40 commits into from Jan 18, 2021
Merged

Feature/msvc msbuild #8238

merged 40 commits into from Jan 18, 2021

Commits on Dec 10, 2020

  1. working in msvc new settings

    @memsharded
    memsharded committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    0a6f828 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2020

  1. merged develop

    @memsharded
    memsharded committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    27c6fc4 View commit details
    Browse the repository at this point in the history

  2. preliminary support for msvc compiler

    @memsharded
    memsharded committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    72f6bee View commit details
    Browse the repository at this point in the history

  3. fix migration

    @memsharded
    memsharded committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    369143b View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. adding msvc for msbuild toolchain

    @memsharded
    memsharded committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    49dad85 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. changing to version 19.1, 19.11, etc

    @memsharded
    memsharded committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    fb110ba View commit details
    Browse the repository at this point in the history

  2. merged develop

    @memsharded
    memsharded committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    ee99a73 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. working on static/dynamic runtime

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    cfc28fe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/msvc

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    c55072f View commit details
    Browse the repository at this point in the history

  3. extracting toolchain checkers to use in CMake

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    b245c43 View commit details
    Browse the repository at this point in the history

  4. removed unused import

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    c363312 View commit details
    Browse the repository at this point in the history

  5. adding checks

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    fb6b57b View commit details
    Browse the repository at this point in the history

  6. adding check

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    e98d911 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/toolchain_checkers' into feature/msvc

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    ae91af5 View commit details
    Browse the repository at this point in the history

  8. first proposal

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    3c3a7b3 View commit details
    Browse the repository at this point in the history

  9. msvc proposal for runtime

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    3bb3e4d View commit details
    Browse the repository at this point in the history

  10. fix migration test

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    ef36fd2 View commit details
    Browse the repository at this point in the history

  11. fixing tests

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    2000c85 View commit details
    Browse the repository at this point in the history

  12. binary compatibility

    @memsharded
    memsharded committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    640b134 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. merged develop

    @memsharded
    memsharded committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    fca3c79 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2020

  1. Merge branch 'feature/msvc' into feature/msvc_msbuild

    @memsharded
    memsharded committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    dc6ecbf View commit details
    Browse the repository at this point in the history

  2. command conan new generates files with new toolchains

    @memsharded
    memsharded committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    1994d1f View commit details
    Browse the repository at this point in the history

  3. removed conanfile

    @memsharded
    memsharded committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    3b71504 View commit details
    Browse the repository at this point in the history

  4. removed files

    @memsharded
    memsharded committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    e66dbe2 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2020

  1. Merge branch 'feature/new_v2' into feature/msvc_msbuild

    @memsharded
    memsharded committed Dec 20, 2020
    Configuration menu
    Copy the full SHA
    5e8fb4f View commit details
    Browse the repository at this point in the history

  2. msbuild working for msvc

    @memsharded
    memsharded committed Dec 20, 2020
    Configuration menu
    Copy the full SHA
    b0f86c6 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. merging develop

    @memsharded
    memsharded committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    1900ff8 View commit details
    Browse the repository at this point in the history

  2. fixing tests

    @memsharded
    memsharded committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    c0c445c View commit details
    Browse the repository at this point in the history

  3. fixing tests

    @memsharded
    memsharded committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    f6528c4 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. refactors

    @memsharded
    memsharded committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    da8689f View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. Update conan/tools/microsoft/toolchain.py 

    Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
    @memsharded @czoido
    memsharded and czoido committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    a311923 View commit details
    Browse the repository at this point in the history

  2. Update conan/tools/microsoft/toolchain.py 

    Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
    @memsharded @czoido
    memsharded and czoido committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    59ed3b0 View commit details
    Browse the repository at this point in the history

  3. Fix conan-io#7715, in rpath_flags use host OS instead of build OS to … 

    …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>
    @Erlkoenig90 @memsharded @SSE4
    3 people committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    ef7053c View commit details
    Browse the repository at this point in the history

  4. modernizing tests (conan-io#8340)

    @memsharded
    memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    b4fd977 View commit details
    Browse the repository at this point in the history

  5. extracting some common code to base class (conan-io#8341)

    @memsharded
    memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    0f2a416 View commit details
    Browse the repository at this point in the history

  6. modernizing tests (conan-io#8345)

    @memsharded
    memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    52d5e42 View commit details
    Browse the repository at this point in the history

  7. Fix help message in command remove --outdated (conan-io#8350)

    @danimtb @memsharded
    danimtb authored and memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    07570f8 View commit details
    Browse the repository at this point in the history

  8. [test] Add test creating a target without namespaces (CMake) (conan-i… 

    …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
    @jgsogo @memsharded
    jgsogo authored and memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    c8b4897 View commit details
    Browse the repository at this point in the history

  9. update tests (conan-io#8354)

    @czoido @memsharded
    czoido authored and memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    7d81f9d View commit details
    Browse the repository at this point in the history

  10. added integration test for msbuild

    @memsharded
    memsharded committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    7e2beca View commit details
    Browse the repository at this point in the history