Revert "Merge branch 'zlib-finder' into 'master'"

This reverts merge request !1040

CMakeLists.txt

@@ -77,6 +77,9 @@ set(LFORTRAN_STATIC_BIN no CACHE BOOL "Build LFortran as a static binary")
 set(WITH_LFORTRAN_BINARY_MODFILES YES
     CACHE BOOL "Use binary modfiles")
 
+#ZLIB
+find_package(ZLIB REQUIRED)
+
 # LLVM
 set(WITH_LLVM no CACHE BOOL "Build with LLVM support")
 if (WITH_LLVM)
@@ -108,11 +111,6 @@ if (WITH_LLVM)
     set(HAVE_LFORTRAN_LLVM yes)
 endif()
 
-# Find ZLIB dependency if not already included by LLVM
-if(NOT TARGET ZLIB::ZLIB)
-  find_package(ZLIB REQUIRED)
-endif()
-
 # XEUS (Fortran kernel)
 set(WITH_XEUS no CACHE BOOL "Build with XEUS support")
 if (WITH_XEUS)

cmake/FindZLIB.cmake

@@ -4,10 +4,10 @@ find_library(ZLIB_LIBRARY NAMES libz.a z)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ZLIB DEFAULT_MSG ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
 
-add_library(ZLIB::ZLIB INTERFACE IMPORTED)
-set_property(TARGET ZLIB::ZLIB PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+add_library(p::zlib INTERFACE IMPORTED)
+set_property(TARGET p::zlib PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     ${ZLIB_INCLUDE_DIR})
-set_property(TARGET ZLIB::ZLIB PROPERTY INTERFACE_LINK_LIBRARIES
+set_property(TARGET p::zlib PROPERTY INTERFACE_LINK_LIBRARIES
     ${ZLIB_LIBRARY})
 
 message("ZLIB_INCLUDE_DIR: ${ZLIB_INCLUDE_DIR}")

src/lfortran/CMakeLists.txt

@@ -66,7 +66,7 @@ if (WITH_LLVM)
     endif()
 endif()
 add_library(lfortran_lib ${SRC})
-target_link_libraries(lfortran_lib lfortran_runtime_static ZLIB::ZLIB)
+target_link_libraries(lfortran_lib lfortran_runtime_static p::zlib)
 target_include_directories(lfortran_lib BEFORE PUBLIC ${lfortran_SOURCE_DIR}/src)
 target_include_directories(lfortran_lib BEFORE PUBLIC ${lfortran_BINARY_DIR}/src)
 if (WITH_XEUS)