From 930f8c13c179b8d78b59667076ac0f69c87eaf97 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Mon, 3 Dec 2018 12:39:31 +0100
Subject: [PATCH] deps: unix: Remove zlib, disable nlopt shared build

---
 CMakeLists.txt              |  7 -------
 deps/deps-unix-common.cmake | 12 +-----------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e094a85f..44b77de48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,13 +42,6 @@ if (MSVC)
     add_compile_options(-bigobj -Zm316)
 endif ()
 
-# CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...)
-# We pick it from environment if it is not defined in another way
-if (NOT DEFINED CMAKE_PREFIX_PATH)
-	if (DEFINED ENV{CMAKE_PREFIX_PATH})
-		set(CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
-	endif ()
-endif ()
 message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
 
 # Add our own cmake module path.
diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake
index 7ad1b4290..e4c718d21 100644
--- a/deps/deps-unix-common.cmake
+++ b/deps/deps-unix-common.cmake
@@ -26,6 +26,7 @@ ExternalProject_Add(dep_nlopt
     URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
     CMAKE_GENERATOR "${DEP_MSVC_GEN}"
     CMAKE_ARGS
+        -DBUILD_SHARED_LIBS=OFF
         -DNLOPT_PYTHON=OFF
         -DNLOPT_OCTAVE=OFF
         -DNLOPT_MATLAB=OFF
@@ -35,18 +36,7 @@ ExternalProject_Add(dep_nlopt
     INSTALL_COMMAND ""
 )
 
-ExternalProject_Add(dep_zlib
-    EXCLUDE_FROM_ALL 1
-    URL "https://zlib.net/zlib-1.2.11.tar.xz"
-    URL_HASH SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
-    CMAKE_GENERATOR "${DEP_MSVC_GEN}"
-    CMAKE_ARGS ${DEP_CMAKE_OPTS}
-    INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
-    INSTALL_COMMAND ""
-)
-
 ExternalProject_Add(dep_libpng
-    DEPENDS dep_zlib
     EXCLUDE_FROM_ALL 1
     URL "http://prdownloads.sourceforge.net/libpng/libpng-1.6.35.tar.xz?download"
     URL_HASH SHA256=23912ec8c9584917ed9b09c5023465d71709dce089be503c7867fec68a93bcd7