cmake: Fix paths in .pc files #815
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
meshula
reviewed
Aug 11, 2020
|
@jtojnar, it looks like the copyright in cmake/JoinPaths.cmake is different from the OpenEXR project copyright. In order to accept the change, the copyright will need to read: SPDX-License-Identifier: BSD-3-ClauseCopyright Contributors to the OpenEXR Project.Can you make this submission under these conditions? Thanks. |
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>
|
@cary-ilm sure, relicensed. |
meshula
approved these changes
Aug 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 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