Merge branch 'stable'

src/CMakeLists.txt

@@ -133,18 +133,13 @@ if (TARGET_OS_FREEBSD AND NOT TARGET_OS_DEBIAN_FREEBSD)
 endif()
 
 if (ENABLE_BACKTRACE AND HAVE_BFD)
-    set (common_libraries ${common_libraries} bfd)
+    find_package (ZLIB)
+    set (common_libraries ${common_libraries} bfd ${ZLIB_LIBRARIES})
     if (NOT TARGET_OS_DARWIN)
         set (common_libraries ${common_libraries} iberty)
     endif()
-    if (ENABLE_STATIC OR TARGET_OS_FREEBSD)
-        include (FindZLIB)
-        set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES})
-    endif()
-    if (TARGET_OS_FREEBSD)
-    	if (NOT TARGET_OS_DEBIAN_FREEBSD)
-	        set (common_libraries ${common_libraries} iconv)
-        endif()
+    if (TARGET_OS_FREEBSD AND NOT TARGET_OS_DEBIAN_FREEBSD)
+        set (common_libraries ${common_libraries} iconv)
     endif()
 endif()