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

[cmake] Win-Binary-Addon fixes + Handle "select" as setting type for binary addons #10875

Merged
merged 3 commits into from
Nov 30, 2016
Merged

[cmake] Win-Binary-Addon fixes + Handle "select" as setting type for binary addons #10875

merged 3 commits into from
Nov 30, 2016

Commits on Nov 30, 2016

  1. [game-settings] Add 'select' as setting type 

    The newly added settings generator generates settings with type
'select'. These were then not loaded correctly.
    @fetzerch
    fetzerch committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    7b2a4fe View commit details
    Browse the repository at this point in the history

  2. [addon/depends] Handle autocrlf for depends 

    On Windows, if we have addon dependencies, we need to forcefully disable
autocrlf because otherwise the patches will not apply.

Patches are typically in LF format (and the build system automatically adds
--binary if necessary). But the patches will also not apply if the source files
are in CLRF which can happen if the user has core.autocrlf=true in the
global git config.

A better way of fixing would be to pass the config already to clone:
https://gitlab.kitware.com/cmake/cmake/issues/15799
    @fetzerch
    fetzerch committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    efc8bfb View commit details
    Browse the repository at this point in the history

  3. [addon/depends] Clone only the last commit of dependencies 

    This has been introduced with CMake 3.6 but is ignored on older versions.
    @fetzerch
    fetzerch committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    f095fe3 View commit details
    Browse the repository at this point in the history