Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: conan-io/conan
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop2
Choose a base ref
...
head repository: conan-io/conan
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release/1.66
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 11 files changed
  • 7 contributors

Commits on Jul 12, 2024

  1. Configuration menu
    Copy the full SHA
    b8d375f View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Add possibility to enforce return value of cross_building via conf (#…

    …16728)
    
    Add possibility to enforce return value of cross_building via conf setting
    jasal82 authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    a9e6543 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. ISSUE-16731: "msvc" compatibility with "Visual Studio" is broken (#16732

    )
    
    In case cppstd is set in the Conan profile for "Visual Studio", it is badly
    migrated to "msvc". This change solves: #16731
    
    The change also takes care of to handle the case when the 'default' cppstd is
    set, in this case, it will be erased from the compatible package as well.
    harsszegi authored Jul 29, 2024
    Configuration menu
    Copy the full SHA
    4f11f9f View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Configuration menu
    Copy the full SHA
    76a804b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Configuration menu
    Copy the full SHA
    35c0e4b View commit details
    Browse the repository at this point in the history
  2. Conan 1.65.0

    czoido committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    27c350c View commit details
    Browse the repository at this point in the history
  3. Add gcc 14 to settings (#16815)

    add gcc 14
    czoido authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    49bf86e View commit details
    Browse the repository at this point in the history
  4. conan 1.66.0-dev

    czoido committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    3056986 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Conan 1.x: Fix VCVars for Clang with v14.4 toolset (#16932)

    * Fix VCVars for Clang with v14.4 toolset (backport #16374)
    
    * empty commit
    
    * fix settings
    
    ---------
    
    Co-authored-by: czoido <[email protected]>
    glebov-andrey and czoido authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    8a0bca6 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Conan 1.x: Add apple-clang 16 to settings

    Signed-off-by: Rui Chen <[email protected]>
    chenrui333 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    ec02a5d View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Configuration menu
    Copy the full SHA
    4e20f91 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Configuration menu
    Copy the full SHA
    8455c2c View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2024

  1. Issue with 'automatic' compatible packages and custom package ids (#1…

    …6772)
    
    * Issue with 'automatic' compatible packages and custom package ids
    
    In case the recipe uses its own package_id() and compatible packages
    are generated automatically (e.g. Visual Studio vs msvc), then the compatible
    packages will use wrong 'base' info set for the compatible package id
    generation.
    
    In case the recipe's own package_id() erases a few options / settings,
    the compatible packages will not know about it, as those are generated prior
    the recipe's package_id() is being called.
    
    The change makes sure that first the recipe's package_id() is called, then
    the compatible packages are generated, so that they pick up the updated
    info set.
    
    * test that crashes
    
    * Making sure msvc_compatible handling partially set compiler settings
    
    In case a custom package_id() erased some of the compiler settings for
    'msvc', a 'Visual Studio' equivalent should be created that also
    doesn't have the (possibly) erased elements.
    
    ---------
    
    Co-authored-by: memsharded <[email protected]>
    harsszegi and memsharded authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    029388d View commit details
    Browse the repository at this point in the history
  2. Conan 1.66.0

    czoido committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    a249ba4 View commit details
    Browse the repository at this point in the history
Loading