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: Kitware/CMake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.26.1
Choose a base ref
...
head repository: Kitware/CMake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.26.2
Choose a head ref
  • 8 commits
  • 17 files changed
  • 2 contributors

Commits on Mar 24, 2023

  1. Configuration menu
    Copy the full SHA
    846baa7 View commit details
    Browse the repository at this point in the history
  2. Ninja,Makefile: Restore Fortran module scanning in static library cycle

    Since
    
    * commit eed295f (cmGlobalNinjaGenerator: require that dependency info
                         files work, 2023-02-01, v3.26.0-rc1~1^2~1), and
    * commit 13810de (cmDependsFortran: require that dependency info files
                         work, 2023-02-01, v3.26.0-rc1~1^2),
    
    the Ninja and Makefile generators' module dependency scanning requires
    that scanning results from from linked targets is available before
    scanning the current target.  In the case of a static library cycle,
    we cannot expect this information from other static libraries in the
    cycle.  Previously we supported cyclic cases at the cost of silently
    ignoring missing information.
    
    We already compute a global order of targets that respects all
    `add_dependencies`, but may break `target_link_libraries` dependencies
    that occur in a static library cycle.  Use this order to filter the
    linked targets so we only expect scanning results to be available from
    those targets that build before the current target.
    
    This approach is sufficient to support module dependency scanning in
    static library cycles as long as module dependencies do not cross
    between two libraries in the same cycle.
    
    Fixes: #24631
    bradking committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    01d7860 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge topic 'module-depends-static-lib-cycle' into release-3.26

    01d7860 Ninja,Makefile: Restore Fortran module scanning in static library cycle
    846baa7 cmGlobalGenerator: Factor out helper to check target ordering
    
    Acked-by: Kitware Robot <kwrobot@kitware.com>
    Acked-by: buildbot <buildbot@kitware.com>
    Merge-request: !8363
    bradking authored and kwrobot committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    381327c View commit details
    Browse the repository at this point in the history
  2. Ninja: Restore slash style for MinGW tools when extra languages are e…

    …nabled
    
    Since commit f3ca199 (cmGlobalNinjaGenerator: Factor out GNU-like
    command-line detection on Windows, 2023-03-18, v3.26.1~2^2~6), we
    accidentally "unrecognize" MinGW tools on Windows if a language other
    than C or CXX is enabled.  This causes the wrong slash style to be
    generated in paths in `build.ninja`.
    
    Fixes: #24642
    bradking committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    a67cd9c View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Merge topic 'mingw-slashes' into release-3.26

    a67cd9c Ninja: Restore slash style for MinGW tools when extra languages are enabled
    
    Acked-by: Kitware Robot <kwrobot@kitware.com>
    Acked-by: buildbot <buildbot@kitware.com>
    Merge-request: !8368
    bradking authored and kwrobot committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    fbe739e View commit details
    Browse the repository at this point in the history
  2. Swift: Restore compatibility with old C++ driver

    The `-wmo` flag added by commit 6063428 (Swift: Update default build
    flags, 2022-10-03, v3.26.0-rc1~585^2~1) behaves differently with the old
    driver.  Detect when the old driver is being used, and avoid adding that
    flag.
    
    Fixes: #24641
    stevapple authored and bradking committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    006e199 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Merge topic 'swift-old-driver' into release-3.26

    006e199 Swift: Restore compatibility with old C++ driver
    
    Acked-by: Kitware Robot <kwrobot@kitware.com>
    Merge-request: !8365
    bradking authored and kwrobot committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    0849598 View commit details
    Browse the repository at this point in the history
  2. CMake 3.26.2

    bradking committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    bef6a27 View commit details
    Browse the repository at this point in the history
Loading