diff options
author | Vollstrecker <werner@vollstreckernet.de> | 2024-12-30 10:56:16 +0100 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:02:26 -0800 |
commit | 15a3751836739a987bfd1fb73d1c2f20ef85e69b (patch) | |
tree | 510b825ebc267b339991d6c3cbb93f05cc11b286 | |
parent | ede311d685a536fbf4a287818b70412baa14ca76 (diff) | |
download | zlib-15a3751836739a987bfd1fb73d1c2f20ef85e69b.tar.gz zlib-15a3751836739a987bfd1fb73d1c2f20ef85e69b.tar.bz2 zlib-15a3751836739a987bfd1fb73d1c2f20ef85e69b.zip |
CMake: Order the includes consistently.
-rw-r--r-- | CMakeLists.txt | 5 | ||||
-rw-r--r-- | contrib/minizip/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9003fd5..f9e9620 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -38,11 +38,12 @@ if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI) | |||
38 | message(STATUS "No CMAKE_BUILD_TYPE set -- using Release") | 38 | message(STATUS "No CMAKE_BUILD_TYPE set -- using Release") |
39 | set(CMAKE_BUILD_TYPE Release) | 39 | set(CMAKE_BUILD_TYPE Release) |
40 | endif(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI) | 40 | endif(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI) |
41 | include(CheckTypeSize) | 41 | |
42 | include(CheckCSourceCompiles) | ||
42 | include(CheckFunctionExists) | 43 | include(CheckFunctionExists) |
43 | include(CheckIncludeFile) | 44 | include(CheckIncludeFile) |
44 | include(CheckCSourceCompiles) | ||
45 | include(CMakePackageConfigHelpers) | 45 | include(CMakePackageConfigHelpers) |
46 | include(CheckTypeSize) | ||
46 | include(CPack) | 47 | include(CPack) |
47 | include(GNUInstallDirs) | 48 | include(GNUInstallDirs) |
48 | 49 | ||
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt index b97a626..2cf23d2 100644 --- a/contrib/minizip/CMakeLists.txt +++ b/contrib/minizip/CMakeLists.txt | |||
@@ -32,11 +32,11 @@ if(MINGW) | |||
32 | option(MINIZIP_INSTALL_COMPAT_DLL "Install a copy as libminizip-1.dll" ON) | 32 | option(MINIZIP_INSTALL_COMPAT_DLL "Install a copy as libminizip-1.dll" ON) |
33 | endif(MINGW) | 33 | endif(MINGW) |
34 | 34 | ||
35 | include(CheckCSourceCompiles) | ||
35 | include(CheckFunctionExists) | 36 | include(CheckFunctionExists) |
36 | include(CheckIncludeFile) | 37 | include(CheckIncludeFile) |
37 | include(CheckCSourceCompiles) | ||
38 | include(CMakePackageConfigHelpers) | 38 | include(CMakePackageConfigHelpers) |
39 | include(CPack) | 39 | include(CheckTypeSize) |
40 | include(GNUInstallDirs) | 40 | include(GNUInstallDirs) |
41 | 41 | ||
42 | if(MINIZIP_ENABLE_BZIP2) | 42 | if(MINIZIP_ENABLE_BZIP2) |