Kim Kulling
|
d898ecc80c
|
Fix another typo.
|
2021-01-06 18:59:13 +01:00 |
|
Kim Kulling
|
5222ab989f
|
Fix a typo
|
2021-01-06 18:51:59 +01:00 |
|
Kim Kulling
|
b23ecb4864
|
Update CMakeLists.txt
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
|
2021-01-06 18:51:30 +01:00 |
Fabrice Fontaine
|
bfe35fc06b
|
contrib/zlib/CMakeLists.txt: don't install zlib
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
2020-12-27 15:27:41 +01:00 |
Silvio Traversaro
|
3b5212067c
|
Fix CMake config generation
Use standard CMake function to generate the CMake config files.
|
2020-10-14 23:55:28 +02:00 |
Peter Seiderer
|
74c8d09bd8
|
contrib/zlib: disable dynamic library building
Fixes compile failure for static only toolchains (and assimp
links against the static one).
|
2020-04-13 14:55:57 +02:00 |
Kim Kulling
|
b072614fad
|
disable warnings for zib.
|
2020-02-15 11:40:26 +01:00 |
|
kimkulling
|
79f62b0174
|
closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build.
|
2019-04-08 14:24:33 +02:00 |
Jared Mulconry
|
bab6ca2085
|
Upgraded zlib to 1.2.11.1 from the develop branch.
|
2017-10-04 20:33:59 +11:00 |
|
Kim Kulling
|
524834c307
|
Fix line endings.
|
2015-08-08 18:02:37 +02:00 |
Alexander Gessler
|
455d190fd0
|
CMakeLists: backwards compatibility with CMake < 3.0.
|
2015-01-31 20:51:36 +01:00 |
Gustav
|
7c17c5f46b
|
Also install zlibstatic
|
2014-12-29 16:30:44 +01:00 |
|
Gustav
|
e6988f62f6
|
Fixed cmake 3x cmp0048 warning
|
2014-12-29 16:18:17 +01:00 |
|
Kim Kulling
|
f99e307c4b
|
bugfix:
- remove commented code in cmake build for zlib_static.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
|
2014-01-29 21:07:21 +01:00 |
Alexander Gessler
|
639afc6f01
|
Apply patch from #168. Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea, but leave all Zlib install stuff commented.
|
2013-10-29 00:52:47 +01:00 |
|
Alexander Gessler
|
561f3bc6ea
|
Update CMakeLists.txt for zlib to build on MSVC again, closes #170.
|
2013-10-27 18:19:08 +01:00 |
|
Kim Kulling
|
e88fcb27bf
|
update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 )
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
|
2013-10-14 19:27:40 +02:00 |
aramis_acg
|
c05acabea9
|
- update cmake build environment, now includes targets to build debian packages for Assimp.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
|
2011-05-09 19:34:21 +00:00 |