Remove zlib from surface on nurbs.

Using system installed zlib.

Author: larshg

CMakeLists.txt

@@ -449,17 +449,6 @@ endif()
 # Boost (required)
 include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake")
 
-# System zlib (for nurbs on surface)
-option(WITH_SYSTEM_ZLIB "Use system zlib" TRUE)
-if(WITH_SYSTEM_ZLIB)
-  find_package(ZLIB)
-  if(ZLIB_FOUND)
-    set(HAVE_ZLIB ON)
-  endif()
-else()
-  message(WARNING "CMake will use a ZLIB version bundled with the PCL source code. However, that is an older version which may pose a risk and may be removed in a future PCL release. It is recommended to install an up-to-date version of ZLIB on your system and set WITH_SYSTEM_ZLIB=TRUE.")
-endif()
-
 option(WITH_SYSTEM_CJSON "Use system cJSON" TRUE)
 if(WITH_SYSTEM_CJSON)
   find_package(cJSON)

pcl_config.h.in

@@ -63,8 +63,6 @@
 
 #cmakedefine HAVE_PNG
 
-#cmakedefine HAVE_ZLIB
-
 #cmakedefine HAVE_CJSON
 
 #cmakedefine PCL_PREFER_BOOST_FILESYSTEM

surface/CMakeLists.txt

@@ -67,15 +67,9 @@ if(BUILD_surface_on_nurbs)
   include(src/3rdparty/opennurbs/openNURBS.cmake)
   include(src/on_nurbs/on_nurbs.cmake)
 
-  if(WITH_SYSTEM_ZLIB)
-    find_package(ZLIB REQUIRED)
-    list(APPEND ON_NURBS_LIBRARIES ${ZLIB_LIBRARIES})
-    list(APPEND SUBSYS_EXT_DEPS zlib)
-  else()
-    include(src/3rdparty/opennurbs/zlib.cmake)
-    list(APPEND OPENNURBS_INCLUDES ${ZLIB_INCLUDES})
-    list(APPEND OPENNURBS_SOURCES ${ZLIB_SOURCES})
-  endif()
+  find_package(ZLIB REQUIRED)
+  list(APPEND ON_NURBS_LIBRARIES ${ZLIB_LIBRARIES})
+  list(APPEND SUBSYS_EXT_DEPS zlib)
 endif()
 
 set(POISSON_INCLUDES