Commit Graph

48 Commits

Author SHA1 Message Date
Mark Adler f1f503da85 Fix cmake build directory interference issue. 2024-01-28 21:50:26 -08:00
Tomas Berger df3b265064 Add option to CMakeLists.txt to disable renaming of zconf.h. 2024-01-23 08:39:24 -08:00
Mark Adler 9f0f2d4f9f Change version number on develop branch to 1.3.1.1. 2024-01-22 13:07:41 -08:00
Mark Adler 51b7f2abda zlib 1.3.1 2024-01-22 10:32:37 -08:00
tr1cks 2e3d86c4e1 Add target include directories to CMakeLists.txt.
This enables the addition of zlib to other projects.
2024-01-22 05:43:21 -08:00
Mark Adler 7b632b486a Revert "Add a CMake option to link the C runtime statically."
This reverts commit 44dc43ab04.
2024-01-19 10:10:42 -08:00
gastush ade6825c49 Fix cmake build on AIX.
The --version-script linker option is not supported by the linker on AIX systems
2024-01-17 17:52:19 -08:00
Peter Taylor 6201f89384 Add cmake option to control the build of the example executables. 2024-01-17 15:34:01 -08:00
tbeu 44dc43ab04 Add a CMake option to link the C runtime statically. 2024-01-17 14:55:54 -08:00
Mark Adler 3a98b57e55 Change version number on develop branch to 1.3.0.1. 2023-08-18 13:23:07 -07:00
Mark Adler 09155eaa2f zlib 1.3 2023-08-18 01:45:36 -07:00
Bruno S Marques 9889e98868 Avoid cmake deprecation warning. 2023-08-17 17:11:11 -07:00
Mark Adler 41fda48fc2 Change version number on develop branch to 1.2.13.1. 2022-10-15 09:02:21 -07:00
Mark Adler 04f42ceca4 zlib 1.2.13 2022-10-12 22:06:55 -07:00
Mark Adler d0704a8201 Remove deleted assembler code references.
The code was removed, but the builds that used the code were not
updated. This fixes that. Thanks to Adenilson and toxieainc for
the patches.
2022-10-06 20:43:09 -07:00
Mark Adler a4c17581d8 Change version number on develop branch to 1.2.12.1. 2022-03-27 18:07:49 -07:00
Mark Adler 21767c654d zlib 1.2.12 2022-03-27 16:05:02 -07:00
Mark Adler 7d60b86782 Change version number to 1.2.11.1. 2017-01-15 22:46:03 -08:00
Mark Adler cacf7f1d4e zlib 1.2.11 2017-01-15 09:29:40 -08:00
Mark Adler 11ceaed751 Change version number to 1.2.10.1. 2017-01-15 09:07:08 -08:00
Mark Adler 4a090adef8 zlib 1.2.10 2017-01-02 18:21:29 -08:00
Mark Adler 20e472546e Change version number to zlib 1.2.9.1. 2017-01-01 22:24:17 -08:00
Mark Adler 2fa463bacf zlib 1.2.9 2016-12-31 23:37:10 -08:00
Mark Adler ceeb615f46 Change version number to 1.2.8.1. 2013-05-02 23:12:54 -07:00
Mark Adler e8fee0ea7b Change version number to 1.2.8. 2013-04-28 15:57:10 -07:00
Like Ma bc7e017112 Suport i686 and amd64 assembler builds in CMakeLists.txt.
* Use -DASM686=1 to build with i686 asm.
 * Use -DAMD64=1 to build with amd64 asm.
2013-02-24 00:02:36 -08:00
Will Glynn 27b7723222 Don't specify --version-script on Apple platforms in CMakeLists.txt.
Mac OS X's linker (derived from LLVM, not GNU binutils) does not support
--version-script. Don't specify it on this platform.
2013-02-23 23:11:15 -08:00
Will Glynn bb97bc9d50 Quote --version-script argument in CMakeLists.txt.
Previously, spaces in ${CMAKE_CURRENT_SOURCE_PATH} would expand into
multiple linker arguments.
2013-02-23 23:03:42 -08:00
Thomas Roß 486ef7b4b4 Fix CMake compilation of static lib for MSVC2010 x64. 2012-07-06 21:49:20 -07:00
Daniel Snider 4373bac37e Fix the path to zlib.map in CMakeLists.txt. 2012-04-29 21:20:45 -07:00
Mark Adler 816e34e1b5 Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]. 2012-04-29 21:15:12 -07:00
Peter Kuemmel 2bd5bd78a6 Look in build directory for zlib.pc in CMakeLists.txt. 2012-03-18 12:24:18 -07:00
Peter Kuemmel 2c42538c2e Add source directory in CMakeLists.txt for building examples. 2012-03-17 21:45:01 -07:00
Peter Kuemmel 49b5d79a3b Rename zconf.h in CMakeLists.txt to move it out of the way. 2012-03-17 21:43:47 -07:00
Christoph J. Thompson 39c7ed14ac If using cmake with MSVC, add the source directory to the includes.
modified:   CMakeLists.txt
2012-03-12 22:15:16 -07:00
Christoph J. Thompson c1e84b258c Include version symbols for cmake builds.
Add a version variable so it gets added to the pkg-config file.
2012-03-11 10:16:12 -07:00
Christoph J. Thompson cd71ef3021 Build both a static and a shared version of zlib with cmake. 2012-03-11 10:16:12 -07:00
Christoph J. Thompson ca6e7a0d55 Generate and install the pkg-config file with cmake. 2012-03-11 10:16:04 -07:00
Christoph J. Thompson f8867924c1 Allow overriding the default install locations for cmake. 2012-03-11 10:10:15 -07:00
Mark Adler 509c1d2860 Fix CMakeLists.txt for cross compilation [McClure]. 2012-01-16 18:51:23 -08:00
Mark Adler 4ab814df83 Remove hard-coding of resource compiler in CMakeLists.txt [Blammo] 2011-12-17 14:28:33 -08:00
Mark Adler 1b57de3aef Move example.c and minigzip.c to test/. 2011-11-27 14:15:32 -08:00
Mark Adler 05d47d2627 zlib 1.2.4.1 2011-09-09 23:34:22 -07:00
Mark Adler 67cc20d004 zlib 1.2.4-pre1 2011-09-09 23:32:36 -07:00
Mark Adler 7751bd4c71 zlib 1.2.3.9 2011-09-09 23:27:26 -07:00
Mark Adler 7df877eccd zlib 1.2.3.7 2011-09-09 23:27:08 -07:00
Mark Adler dc5a43ebfa zlib 1.2.3.6 2011-09-09 23:26:58 -07:00
Mark Adler d004b04783 zlib 1.2.3.5 2011-09-09 23:26:49 -07:00