changeset 11:1aa4bcc50188

libz: switch to markdown format
author David Demelier <markand@malikania.fr>
date Fri, 11 Aug 2017 15:56:42 +0200
parents 89bc83dc91e2
children d3c5b3517f1d
files libz.md libz/CMakeLists.txt
diffstat 2 files changed, 90 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libz.md	Fri Aug 11 15:56:42 2017 +0200
@@ -0,0 +1,90 @@
+Build libz
+==========
+
+Version:    1.2.8
+Date:       20170811
+
+Download
+--------
+
+  - http://zlib.net/zlib128.zip
+
+Dependencies
+------------
+
+  - [CMake](https://cmake.org).
+
+Configure
+---------
+
+### Visual Studio (amd64/debug)
+
+    cmake .
+        -DCMAKE_BUILD_TYPE=Debug
+        -DCMAKE_INSTALL_PREFIX=C:/env/vs/amd64d
+        -DBUILD_SHARED_LIBS=True
+        -G"NMake Makefiles"
+
+### Visual Studio (amd64/release)
+
+    cmake .
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_INSTALL_PREFIX=C:/env/vs/amd64
+        -DBUILD_SHARED_LIBS=True
+        -G"NMake Makefiles"
+
+### Visual Studio (x86/debug)
+
+    cmake .
+        -DCMAKE_BUILD_TYPE=Debug
+        -DCMAKE_INSTALL_PREFIX=C:/env/vs/x86d
+        -DBUILD_SHARED_LIBS=True
+        -G"NMake Makefiles"
+
+### Visual Studio (amd64/release)
+
+    cmake .
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_INSTALL_PREFIX=C:/env/vs/x86
+        -DBUILD_SHARED_LIBS=True
+        -G"NMake Makefiles"
+
+### MinGW (amd64)
+
+    cmake .
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_INSTALL_PREFIX=C:/env/mingw/amd64
+        -DBUILD_SHARED_LIBS=True
+        -G"MinGW Makefiles"
+
+### MinGW (x86)
+
+    cmake .
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_INSTALL_PREFIX=C:/env/mingw/x86
+        -DBUILD_SHARED_LIBS=True
+        -G"MinGW Makefiles"
+
+Build
+-----
+
+### Visual Studio
+
+    nmake
+    nmake install
+
+### MinGW (amd64)
+
+    make
+    make install
+    cmake -E copy
+        C:/env/mingw/amd64/lib/libzlib.dll.a
+        C:/env/mingw/amd64/lib/libz.dll.a
+
+### MinGW (x86)
+
+    make
+    make install
+    cmake -E copy
+        C:/env/mingw/x86/lib/libzlib.dll.a
+        C:/env/mingw/x86/lib/libz.dll.a
--- a/libz/CMakeLists.txt	Fri Aug 11 15:42:41 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# CMakeLists.txt -- build for libz
-#
-# Copyright (c) 2016-2017 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-cmake_minimum_required(VERSION 3.6)
-project(libz)
-include(ExternalProject)
-
-if (MSVC)
-    set(GENERATOR "NMake Makefiles")
-elseif (MINGW)
-    set(GENERATOR "MinGW Makefiles")
-endif ()
-
-ExternalProject_Add(
-    libz
-    URL http://zlib.net/zlib128.zip
-    URL_HASH SHA1=5782f3539015ead310234fd8637a7fe78af3d16c
-    CMAKE_GENERATOR ${GENERATOR}
-    CMAKE_ARGS
-        -DCMAKE_BUILD_TYPE=$<CONFIG>
-        -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-)
-
-if (MINGW)
-    # Lots of packages search for "libz.dll.a", so copy the libzlib.dll.a.
-    ExternalProject_Add_Step(
-        libz
-        postinstall
-        DEPENDEES install
-        COMMAND
-        ${CMAKE_COMMAND} -E copy
-            ${CMAKE_INSTALL_PREFIX}/lib/libzlib.dll.a
-            ${CMAKE_INSTALL_PREFIX}/lib/libz.dll.a
-    )
-endif ()