Commit | Line | Data |
---|---|---|
942c7889 MB |
1 | Fix pkg-config files when using the CMake build system. |
2 | ||
3 | Upstream bug report: | |
4 | https://github.com/openexr/openexr/issues/567 | |
5 | ||
6 | diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt | |
7 | index 508176a..9e6ab91 100644 | |
8 | --- a/IlmBase/config/CMakeLists.txt | |
9 | +++ b/IlmBase/config/CMakeLists.txt | |
10 | @@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG) | |
11 | # use a helper function to avoid variable pollution, but pretty simple | |
12 | function(ilmbase_pkg_config_help pcinfile) | |
13 | set(prefix ${CMAKE_INSTALL_PREFIX}) | |
14 | - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) | |
15 | - set(libdir ${CMAKE_INSTALL_LIBDIR}) | |
16 | - set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) | |
17 | + set(exec_prefix ${CMAKE_INSTALL_FULL_BINDIR}) | |
18 | + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) | |
19 | + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) | |
20 | set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) | |
21 | if(TARGET Threads::Threads) | |
22 | # hrm, can't use properties as they end up as generator expressions | |
23 | diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt | |
24 | index 1ef829a..b8dc141 100644 | |
25 | --- a/OpenEXR/config/CMakeLists.txt | |
26 | +++ b/OpenEXR/config/CMakeLists.txt | |
27 | @@ -72,9 +72,9 @@ if(OPENEXR_INSTALL_PKG_CONFIG) | |
28 | # use a helper function to avoid variable pollution, but pretty simple | |
29 | function(openexr_pkg_config_help pcinfile) | |
30 | set(prefix ${CMAKE_INSTALL_PREFIX}) | |
31 | - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) | |
32 | - set(libdir ${CMAKE_INSTALL_LIBDIR}) | |
33 | - set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) | |
34 | + set(exec_prefix ${CMAKE_INSTALL_FULL_BINDIR}) | |
35 | + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) | |
36 | + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) | |
37 | set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) | |
38 | if(TARGET Threads::Threads) | |
39 | # hrm, can't use properties as they end up as generator expressions | |
40 |