Merge pull request #6399 from larshg/removezlibusedinsurfacenurbs

Remove local source copied zlib files

Author: larshg

CMakeLists.txt

@@ -449,15 +449,10 @@ 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.")
+# System zlib (for io-png and nurbs on surface)
+find_package(ZLIB)
+if(ZLIB_FOUND)
+  set(HAVE_ZLIB ON)
 endif()
 
 option(WITH_SYSTEM_CJSON "Use system cJSON" TRUE)

io/CMakeLists.txt

@@ -5,9 +5,9 @@ set(SUBSYS_EXT_DEPS boost eigen3)
 
 PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ON)
 if(WIN32)
-  PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS} OPT_DEPS openni openni2 ensenso davidSDK dssdk rssdk rssdk2 pcap png vtk OpenMP EXT_DEPS ${SUBSYS_EXT_DEPS})
+  PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS} OPT_DEPS openni openni2 ensenso davidSDK dssdk rssdk rssdk2 pcap png vtk OpenMP ZLIB EXT_DEPS ${SUBSYS_EXT_DEPS})
 else()
-  PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS} OPT_DEPS openni openni2 ensenso davidSDK dssdk pcap png vtk libusb OpenMP EXT_DEPS ${SUBSYS_EXT_DEPS})
+  PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS} OPT_DEPS openni openni2 ensenso davidSDK dssdk pcap png vtk libusb OpenMP ZLIB EXT_DEPS ${SUBSYS_EXT_DEPS})
 endif()
 
 PCL_ADD_DOC("${SUBSYS_NAME}")
@@ -244,7 +244,7 @@ set(srcs
   ${RSSDK2_GRABBER_SOURCES}
 )
 
-if(PNG_FOUND)
+if(PNG_FOUND AND ZLIB_FOUND)
   list(APPEND srcs
     src/libpng_wrapper.cpp
   )
@@ -373,6 +373,10 @@ if(PNG_FOUND)
   target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
 endif()
 
+if(PNG_FOUND AND ZLIB_FOUND)
+  target_link_libraries("${LIB_NAME}" ZLIB::ZLIB)
+endif()
+
 if(LIBUSB_FOUND)
   target_link_libraries("${LIB_NAME}" libusb::libusb)
 endif()

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 SUBSYS_EXT_DEPS zlib)
+  list(APPEND ON_NURBS_LIBRARIES ZLIB::ZLIB)
 endif()
 
 set(POISSON_INCLUDES