Add bindir into zlib.pc.in for compatibility with Cygwin and Msys2

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1c2e26e08038492033e25d94f069ffa1e40f947..571979eb4d6987c21a239f36e364fb3170c94549 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1096,6 +1096,12 @@ else()
     set(PC_INC_INSTALL_DIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
 endif()
 
+if(IS_ABSOLUTE "${CMAKE_INSTALL_BINDIR}")
+    set(PC_BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+else()
+    set(PC_BIN_INSTALL_DIR "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")
+endif()
+
 if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
     set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
 else()

diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein
index df8bf9f0514f1ce4fb6fa229add84e6a3f7f1cdd..a5ff63cef46454ff7d69b0f5decee76fd460bfec 100644 (file)
--- a/zlib.pc.cmakein
+++ b/zlib.pc.cmakein
@@ -1,6 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 symbol_prefix=@ZLIB_SYMBOL_PREFIX@
+bindir=@PC_BIN_INSTALL_DIR@
 libdir=@PC_LIB_INSTALL_DIR@
 sharedlibdir=${libdir}
 includedir=@PC_INC_INSTALL_DIR@

diff --git a/zlib.pc.in b/zlib.pc.in
index 45b35989b1cb410acde755f8a79ba00445acc73b..25cc923ee16ee43d3cb386a37cf37bdd6f462c5c 100644 (file)
--- a/zlib.pc.in
+++ b/zlib.pc.in
@@ -1,6 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 symbol_prefix=@symbol_prefix@
+bindir=@bindir@
 libdir=@libdir@
 sharedlibdir=@sharedlibdir@
 includedir=@includedir@