diff options
| author | Vollstrecker <werner@vollstreckernet.de> | 2024-12-01 10:13:00 +0100 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 19:59:10 -0800 |
| commit | 2b2eec69b52ae600441f6ffb2f545b7833caa842 (patch) | |
| tree | c9a2bab908f44b38a9459077191d8469489cfcd1 | |
| parent | 676246752388ad183594765a49f6b159c2a53db2 (diff) | |
| download | zlib-2b2eec69b52ae600441f6ffb2f545b7833caa842.tar.gz zlib-2b2eec69b52ae600441f6ffb2f545b7833caa842.tar.bz2 zlib-2b2eec69b52ae600441f6ffb2f545b7833caa842.zip | |
CMake: Remove unneeded renaming for in-tree builds and the option for it.
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f2babc..814df18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -65,19 +65,6 @@ if(MSVC) | |||
| 65 | include_directories(${zlib_SOURCE_DIR}) | 65 | include_directories(${zlib_SOURCE_DIR}) |
| 66 | endif() | 66 | endif() |
| 67 | 67 | ||
| 68 | option(RENAME_ZCONF "Rename the zconf when building out of source" ON) | ||
| 69 | if(NOT zlib_SOURCE_DIR STREQUAL zlib_BINARY_DIR AND RENAME_ZCONF) | ||
| 70 | # If we're doing an out of source build and the user has a zconf.h | ||
| 71 | # in their source tree... | ||
| 72 | if(EXISTS ${zlib_SOURCE_DIR}/zconf.h) | ||
| 73 | message(STATUS "Renaming") | ||
| 74 | message(STATUS " ${zlib_SOURCE_DIR}/zconf.h") | ||
| 75 | message(STATUS "to 'zconf.h.included' because this file is included with zlib") | ||
| 76 | message(STATUS "but CMake generates it automatically in the build directory.") | ||
| 77 | file(RENAME ${zlib_SOURCE_DIR}/zconf.h ${zlib_SOURCE_DIR}/zconf.h.included) | ||
| 78 | endif() | ||
| 79 | endif() | ||
| 80 | |||
| 81 | set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc) | 68 | set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc) |
| 82 | configure_file( ${zlib_SOURCE_DIR}/zlib.pc.cmakein | 69 | configure_file( ${zlib_SOURCE_DIR}/zlib.pc.cmakein |
| 83 | ${ZLIB_PC} @ONLY) | 70 | ${ZLIB_PC} @ONLY) |