Assume that CMake is only used as a distribution format and for
non-UNIX systems, commenting out some administration targets.
--HG--
branch : HEAD
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 077de5d..4b97280 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -60,7 +60,7 @@
zip_dirent.c
zip_entry_free.c
zip_entry_new.c
- ${CMAKE_CURRENT_BINARY_DIR}/zip_err_str.c
+ zip_err_str.c
zip_error.c
zip_error_clear.c
zip_error_get.c
@@ -112,13 +112,13 @@
${CMAKE_CURRENT_BINARY_DIR}/..)
# XXX: distribute instead?
-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zip_err_str.c
- COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/make_zip_err_str.sh
- ${CMAKE_CURRENT_SOURCE_DIR}/zip.h
- ${CMAKE_CURRENT_BINARY_DIR}/zip_err_str.c
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/zip.h
- ${CMAKE_CURRENT_SOURCE_DIR}/make_zip_err_str.sh
-)
+#ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zip_err_str.c
+# COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/make_zip_err_str.sh
+# ${CMAKE_CURRENT_SOURCE_DIR}/zip.h
+# ${CMAKE_CURRENT_BINARY_DIR}/zip_err_str.c
+# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/zip.h
+# ${CMAKE_CURRENT_SOURCE_DIR}/make_zip_err_str.sh
+#)
CHECK_FUNCTION_EXISTS(mkstemp HAVE_MKSTEMP)
IF(NOT HAVE_MKSTEMP)
SET(LIBZIP_EXTRA_FILES mkstemp.c)
@@ -127,5 +127,7 @@
ADD_LIBRARY(zip SHARED ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES})
SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 2.0 SOVERSION 2 )
TARGET_LINK_LIBRARIES(zip z)
-INSTALL(TARGETS zip LIBRARY DESTINATION lib)
+INSTALL(TARGETS zip
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib)
#CREATE_LIBTOOL_FILE(zip lib)
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 3520e83..6091086 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -80,28 +80,28 @@
# custom maintainer targets
-FOREACH(MAN ${MAN_PAGES})
- ADD_CUSTOM_TARGET(${MAN}.man
- DEPENDS ${MAN}.mdoc
- COMMAND mdoc2man ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.mdoc > ${MAN}.new
- COMMAND diff -I NiH ${MAN}.new ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.man || mv ${MAN}.new ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.man
- COMMAND rm -f ${MAN}.new
- COMMENT Updating man page ${MAN}.man
- )
- ADD_CUSTOM_TARGET(${MAN}.html
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.mdoc
- COMMAND nroff -mdoc2html ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.mdoc | sed -e "s,../html[0-9]/,," > ${MAN}.html
- COMMENT Updating HTML page ${MAN}.html
- )
-ENDFOREACH(MAN)
+#FOREACH(MAN ${MAN_PAGES})
+# ADD_CUSTOM_TARGET(${MAN}.man
+# DEPENDS ${MAN}.mdoc
+# COMMAND mdoc2man ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.mdoc > ${MAN}.new
+# COMMAND diff -I NiH ${MAN}.new ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.man || mv ${MAN}.new ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.man
+# COMMAND rm -f ${MAN}.new
+# COMMENT Updating man page ${MAN}.man
+# )
+# ADD_CUSTOM_TARGET(${MAN}.html
+# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.mdoc
+# COMMAND nroff -mdoc2html ${CMAKE_CURRENT_SOURCE_DIR}/${MAN}.mdoc | sed -e "s,../html[0-9]/,," > ${MAN}.html
+# COMMENT Updating HTML page ${MAN}.html
+# )
+#ENDFOREACH(MAN)
-STRING(REGEX REPLACE .mdoc .man MANDEPEND "${MDOC_PAGES}")
-ADD_CUSTOM_TARGET(update-man
- DEPENDS ${MANDEPEND})
+#STRING(REGEX REPLACE .mdoc .man MANDEPEND "${MDOC_PAGES}")
+#ADD_CUSTOM_TARGET(update-man
+# DEPENDS ${MANDEPEND})
-STRING(REGEX REPLACE .mdoc .html HTMLDEPEND "${MDOC_PAGES}")
-ADD_CUSTOM_TARGET(update-html
- DEPENDS ${HTMLDEPEND})
+#STRING(REGEX REPLACE .mdoc .html HTMLDEPEND "${MDOC_PAGES}")
+#ADD_CUSTOM_TARGET(update-html
+# DEPENDS ${HTMLDEPEND})
# XXX: strange error:
#[ 94%] zipcmp.html
