From: Andrew R. <and...@us...> - 2006-07-31 18:34:10
|
Update of /cvsroot/plplot/plplot/doc/docbook/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30650/doc/docbook/src Modified Files: CMakeLists.txt Log Message: Fix bug where file extension was not properly set for .html files. Fix file globbing so html, info and man files are correctly installed. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/plplot/plplot/doc/docbook/src/CMakeLists.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CMakeLists.txt 31 Jul 2006 15:56:34 -0000 1.5 +++ CMakeLists.txt 31 Jul 2006 18:33:53 -0000 1.6 @@ -195,10 +195,13 @@ ########### install files ############### +# We use file(GLOB ...) to generate lists of html, info and man files +# to install. These need to be generated at install time, not at +# Makefile creation time and so we also need to use the install(CODE ...) +# command. This makes for slightly ugly looking code. + if (BUILD_HTML OR PREBUILT_DOC) - install(CODE "file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.html)") - install(CODE "message(\"\${HTML_FILES}\")") - install(CODE "foreach(file \${HTML_FILE}) \n file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \${file}) \n endforeach (file \${HTML_FILE})") + install(CODE "file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})\n foreach(file \${HTML_FILES}) \n file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${HTML_FILES}\")") install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} DESTINATION ${DOC_DIR}/html ) endif (BUILD_HTML OR PREBUILT_DOC) @@ -207,13 +210,13 @@ endif (BUILD_PRINT OR PREBUILT_DOC) if (BUILD_MAN OR PREBUILT_DOC) - install_files(${MAN_DIR}/man3 "${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL}") + install(CODE "file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})\n foreach(file \${MAN_FILES}) \n file(INSTALL DESTINATION ${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${MAN_FILES}\")") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 ) endif (BUILD_MAN OR PREBUILT_DOC) if (BUILD_INFO OR PREBUILT_DOC) - install(CODE "file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} ${INFO_FILES} DESTINATION ${INFO_DIR} ) + install(CODE "file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)\n foreach(file \${INFO_FILES}) \n file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${INFO_FILES}\")") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} ) endif (BUILD_INFO OR PREBUILT_DOC) |