Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • CMake CMake
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 4,107
    • Issues 4,107
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 19
    • Merge requests 19
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • External wiki
    • External wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • CMakeCMake
  • CMakeCMake
  • Merge requests
  • !6976

FindMatlab: Fix version detection for MCR >= 9.10

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Tom M. requested to merge derselbst/cmake:mcr911 into master Feb 13, 2022
  • Overview 5
  • Commits 1
  • Pipelines 5
  • Changes 1

Recent MCR have the following VersionInfo.xml:

<version>9.11.0.1837725</version>

Currently, CMake reports this as:

[MATLAB] Current version is 9.1 located C:/Program Files/MATLAB/MATLAB Runtime/v911

Which is bad, because when explicitly asking CMake for version 9.11, it would erroneously fail, as it believes it found version 9.1.

This PR changes the regex to allow multiple digits per version number, making CMake correctly recognize recent MCR versions and even a possible upcoming version 10.x.

Backport: release
Topic-rename: FindMatlab-mcr911

Edited Feb 14, 2022 by Brad King
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: mcr911