diff options
| author | Marcin Serwin <marcin@serwin.dev> | 2026-02-18 18:20:57 +0100 |
|---|---|---|
| committer | Mark Adler <git@madler.net> | 2026-03-26 16:05:52 -0700 |
| commit | 91292b1c442ae0f960badf17a9bdfd071b7b0c7b (patch) | |
| tree | 2b2bfaf44bb25a59d8b5f6189235da05798cc0a9 | |
| parent | ed659f3802d809bc31643b5bd9703fbc57301b58 (diff) | |
| download | zlib-91292b1c442ae0f960badf17a9bdfd071b7b0c7b.tar.gz zlib-91292b1c442ae0f960badf17a9bdfd071b7b0c7b.tar.bz2 zlib-91292b1c442ae0f960badf17a9bdfd071b7b0c7b.zip | |
CMake: Emit correct variables for absolute install directories.
The CMAKE_INSTALL_*DIR variables can be absolute. In that case they
should not be appended to the prefix.
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | zlib.pc.cmakein | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eef01a89..22a49e4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -112,6 +112,16 @@ check_c_source_compiles( | |||
| 112 | 112 | ||
| 113 | unset(CMAKE_COMPILE_FLAGS) | 113 | unset(CMAKE_COMPILE_FLAGS) |
| 114 | set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc) | 114 | set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc) |
| 115 | if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") | ||
| 116 | set(pc_includedir "${CMAKE_INSTALL_INCLUDEDIR}") | ||
| 117 | else() | ||
| 118 | set(pc_includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") | ||
| 119 | endif() | ||
| 120 | if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") | ||
| 121 | set(pc_libdir "${CMAKE_INSTALL_LIBDIR}") | ||
| 122 | else() | ||
| 123 | set(pc_libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") | ||
| 124 | endif() | ||
| 115 | configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY) | 125 | configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY) |
| 116 | configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h) | 126 | configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h) |
| 117 | 127 | ||
diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein index 6f194731..c8edaf65 100644 --- a/zlib.pc.cmakein +++ b/zlib.pc.cmakein | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | prefix=@CMAKE_INSTALL_PREFIX@ | 1 | prefix=@CMAKE_INSTALL_PREFIX@ |
| 2 | exec_prefix=${prefix} | 2 | exec_prefix=${prefix} |
| 3 | libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ | 3 | libdir=@pc_libdir@ |
| 4 | sharedlibdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ | 4 | sharedlibdir=${libdir} |
| 5 | includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ | 5 | includedir=@pc_includedir@ |
| 6 | 6 | ||
| 7 | Name: zlib | 7 | Name: zlib |
| 8 | Description: zlib compression library | 8 | Description: zlib compression library |
