patch zlib check
authorErwan Le Blond <erwan.LEBLOND@eurogiciel.fr>
Tue, 5 Mar 2013 17:34:09 +0000 (18:34 +0100)
committerErwan Le Blond <erwan.LEBLOND@eurogiciel.fr>
Tue, 5 Mar 2013 17:34:09 +0000 (18:34 +0100)
3rd-party/zisofs_tools/CMakeLists.txt
genisoimage/CMakeLists.txt

index 75068bf..f7329d6 100644 (file)
@@ -1,8 +1,9 @@
 PROJECT (ZISOFSTOOLS C)
+FIND_PACKAGE(ZLIB REQUIRED)
 ADD_DEFINITIONS(-Wall -W -Wpointer-arith -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wshadow -Wcast-align)
 AUX_SOURCE_DIRECTORY(. MKZ_SRCS)
 ADD_EXECUTABLE (mkzftree ${MKZ_SRCS})
-TARGET_LINK_LIBRARIES(mkzftree z)
+TARGET_LINK_LIBRARIES(mkzftree ${ZLIB_LIBRARY})
 SET_TARGET_PROPERTIES(mkzftree PROPERTIES  SKIP_BUILD_RPATH TRUE)
 INSTALL(TARGETS mkzftree DESTINATION bin)
 INSTALL(FILES mkzftree.1 DESTINATION share/man/man1)
index 303ba4d..bb42626 100644 (file)
@@ -1,5 +1,5 @@
 PROJECT (MKISOFS C)
-
+FIND_PACKAGE(ZLIB REQUIRED)
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 
@@ -45,7 +45,7 @@ ENDIF(NOT HAVE_GETOPT_LONG)
 LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls  ../wodim)
 
 ADD_EXECUTABLE (genisoimage genisoimage.c ${MKISOFS_MOST_SRCS})
-TARGET_LINK_LIBRARIES(genisoimage wodimstuff hfs_iso  ${MAGICLIBS} c unls z bz2 ${EXTRA_LIBICONV} ${EXTRA_LIBS})
+TARGET_LINK_LIBRARIES(genisoimage wodimstuff hfs_iso  ${MAGICLIBS} c unls ${ZLIB_LIBRARY} bz2 ${EXTRA_LIBICONV} ${EXTRA_LIBS})
 
 # common lib set and genisoimage source parts for the rest
 LINK_LIBRARIES(wodimstuff ${EXTRA_LIBS}  unls ${EXTRA_LIBICONV} )