diff options
| author | Erwan Le Blond <erwan.LEBLOND@eurogiciel.fr> | 2013-03-05 18:34:09 +0100 |
|---|---|---|
| committer | Erwan Le Blond <erwan.LEBLOND@eurogiciel.fr> | 2013-03-05 18:34:09 +0100 |
| commit | 484c6396ba9ccd4ffc937832ac2862e2b65b90d6 (patch) | |
| tree | 4a03980c63c7d82e6faa51280c6184e89094199a | |
| parent | 072595200a723d421a125aefb2a098df47e30a58 (diff) | |
| download | cdrkit-484c6396ba9ccd4ffc937832ac2862e2b65b90d6.tar.gz cdrkit-484c6396ba9ccd4ffc937832ac2862e2b65b90d6.tar.bz2 cdrkit-484c6396ba9ccd4ffc937832ac2862e2b65b90d6.zip | |
patch zlib check
| -rw-r--r-- | 3rd-party/zisofs_tools/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | genisoimage/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/3rd-party/zisofs_tools/CMakeLists.txt b/3rd-party/zisofs_tools/CMakeLists.txt index 75068bf..f7329d6 100644 --- a/3rd-party/zisofs_tools/CMakeLists.txt +++ b/3rd-party/zisofs_tools/CMakeLists.txt @@ -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) diff --git a/genisoimage/CMakeLists.txt b/genisoimage/CMakeLists.txt index 303ba4d..bb42626 100644 --- a/genisoimage/CMakeLists.txt +++ b/genisoimage/CMakeLists.txt @@ -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} ) |