From d42633bfd0d7bfa6ab2d00810beed7b6c4e58342 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A1n?= <jjergus@fb.com>
Date: Wed, 26 Feb 2020 13:15:30 -0800
Subject: [PATCH] fix libzip build on latest ubuntu/debian (#8664)

Summary:
Some systems call cmake with explicitly overridden CMAKE_INSTALL_LIBDIR,
so we have to pass that through.
Pull Request resolved: https://github.com/facebook/hhvm/pull/8664

Differential Revision: D20125089

Pulled By: jjergus

fbshipit-source-id: 3c21ccb5b400d74afbc6a0c3fb640a1b96f7b2e9
---
 third-party/libzip/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/third-party/libzip/CMakeLists.txt b/third-party/libzip/CMakeLists.txt
index c6dd8f23e54..0e10232219b 100644
--- a/third-party/libzip/CMakeLists.txt
+++ b/third-party/libzip/CMakeLists.txt
@@ -20,7 +20,6 @@ endif()
 if (NOT LIBZIP_FOUND)
   cmake_minimum_required(VERSION 2.8.0)
   include(ExternalProject)
-  include(GNUInstallDirs)
 
   set(LIBZIP_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/libzip-install")
 
@@ -44,11 +43,12 @@ if (NOT LIBZIP_FOUND)
     -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_INSTALL_PREFIX=${LIBZIP_PREFIX}
+    -DCMAKE_INSTALL_INCLUDEDIR=include
+    -DCMAKE_INSTALL_LIBDIR=lib
   )
 
   add_dependencies(libzip libzipBuild)
-  target_include_directories(libzip INTERFACE
-    "${LIBZIP_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+  target_include_directories(libzip INTERFACE "${LIBZIP_PREFIX}/include")
   target_link_libraries(libzip INTERFACE
-    "${LIBZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}zip${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    "${LIBZIP_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zip${CMAKE_STATIC_LIBRARY_SUFFIX}")
 endif ()
-- 
2.11.4.GIT