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: Fix paths in .pc files #815

Merged
merged 2 commits into from
Aug 17, 2020
Merged

cmake: Fix paths in .pc files #815

merged 2 commits into from
Aug 17, 2020

Commits on Aug 11, 2020

  1. cmake: Fix paths in .pc files 

    It is not generally true that `CMAKE_INSTALL_<dir>` variables are relative paths:

https://github.com/jtojnar/cmake-snips#concatenating-paths-when-building-pkg-config-files

With AcademySoftwareFoundation@0b26a9d,
CMake concatenates ${prefix} with the GNUInstallDirs variables, which leads to
`includedir=${prefix}/nix/store/x6wqbsys0px1xjpy17h01f0aqwj7khvg-openexr-2.5.2-dev/include`,
when the variables are absolute.

Let's join them properly as paths, not strings.

Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
    @jtojnar
    jtojnar committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    c6d93d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2020

  1. Merge branch 'master' into fix-pc-path

    @cary-ilm
    cary-ilm committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    97af2fe View commit details
    Browse the repository at this point in the history