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

Append CONAN_LIBS and CONAN_SYSTEM_LIBS CMake variables to avoid overwriting user-defined libs #6433

Merged
merged 6 commits into from
Jan 30, 2020
Merged

Append CONAN_LIBS and CONAN_SYSTEM_LIBS CMake variables to avoid overwriting user-defined libs #6433

merged 6 commits into from
Jan 30, 2020

Commits on Jan 29, 2020

  1. Modify test for system libs and added user appended conan_libs

    @danimtb
    danimtb committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    530ff07 View commit details
    Browse the repository at this point in the history

  2. Fix append system_libs

    @danimtb
    danimtb committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    5c985c4 View commit details
    Browse the repository at this point in the history

  3. Use CONAN_LIBS for appending user defined libs

    @danimtb
    danimtb committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    521ae83 View commit details
    Browse the repository at this point in the history

  4. fix tests

    @danimtb
    danimtb committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    0f761c4 View commit details
    Browse the repository at this point in the history

  5. Check also system libs

    @danimtb
    danimtb committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    15eddf3 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. Merge branch 'release/1.21.2' into feature/6396

    @danimtb
    danimtb committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    b1e9535 View commit details
    Browse the repository at this point in the history