From: Hans Johnson <hans-johnson@uiowa.edu>
Date: Wed, 16 Jan 2019 16:11:00 +0000 (-0600)
Subject: ENH: Use modern cmake variable conventions
X-Git-Tag: 1.9.9-b1~530
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=016d291ce93d22adb4d00598ca49d9d83478ebfb;p=thirdparty%2Fzlib-ng.git

ENH: Use modern cmake variable conventions

Use recommended naming conventions for variables

See https://cmake.org/cmake/help/v3.0/command/project.html?highlight=project for
the common conventions.

The project() command stores the version number and its components in variables

PROJECT_VERSION, <PROJECT-NAME>_VERSION
PROJECT_VERSION_MAJOR, <PROJECT-NAME>_VERSION_MAJOR
PROJECT_VERSION_MINOR, <PROJECT-NAME>_VERSION_MINOR
PROJECT_VERSION_PATCH, <PROJECT-NAME>_VERSION_PATCH
PROJECT_VERSION_TWEAK, <PROJECT-NAME>_VERSION_TWEAK
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49acb1f4..b51f3f88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,6 @@ project(zlib
   VERSION ${ZLIB_HEADER_VERSION}
   LANGUAGES C)
 
-set(VERSION "${zlib_VERSION}")
-
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
 set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein
index c0e4164d..0635b6e3 100644
--- a/zlib.pc.cmakein
+++ b/zlib.pc.cmakein
@@ -6,7 +6,7 @@ includedir=@INSTALL_INC_DIR@
 
 Name: zlib@SUFFIX@
 Description: zlib-ng compression library
-Version: @VERSION@
+Version: @zlib_VERSION@
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz@SUFFIX@