diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | admin/gendoc.pl | 2 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | data/helppics/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 17 |
5 files changed, 41 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 23703ff5a..bdf2803f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,7 +345,7 @@ ENDIF() # Check for Perl support -# FIXME: This shouldn't be required (we should be able to live without it) +# FIXME: This shouldn't be required (we should be able to live without it) (note: needed for user documentation generation) FIND_PACKAGE(Perl REQUIRED) ADD_DEFINITIONS(-DCOMPILE_PERL_SUPPORT) SET(CMAKE_STATUS_PERL_SUPPORT "yes") @@ -464,7 +464,7 @@ IF(DOXYGEN_FOUND) COMMAND ${DOXYGEN_EXECUTABLE} -u COMMAND mkdir -p ${PROJECT_SOURCE_DIR}/doc/api COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/admin/Doxyfile - TARGET docs + TARGET devdocs ) ELSE() SET(CMAKE_STATUS_DOXYGEN_SUPPORT "no") diff --git a/admin/gendoc.pl b/admin/gendoc.pl index 700ed23f3..74ce94291 100755 --- a/admin/gendoc.pl +++ b/admin/gendoc.pl @@ -45,7 +45,7 @@ $g_prefixes{'class'}="class"; $g_prefixes{'module'}="module"; $g_prefixes{'widget'}="widget"; -$g_version = "3.2.0.99"; +$g_version = "4.0.0"; $g_filehandle=""; $g_shortsIdx{"keyterms"}=0; $g_directory = ""; diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index ec8764fd7..24cdfa396 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,4 +1,9 @@ # CMakeLists for data/ # Find subdirs -SUBDIRS(config defscript deftheme icons man mimelnk msgcolors pics resources_mac) +SUBDIRS(config defscript deftheme helppics icons man mimelnk msgcolors pics) + +IF(APPLE) + # MacOS X + ADD_SUBDIRECTORY(resources_mac) +ENDIF()
\ No newline at end of file diff --git a/data/helppics/CMakeLists.txt b/data/helppics/CMakeLists.txt new file mode 100644 index 000000000..c1a1ab3e3 --- /dev/null +++ b/data/helppics/CMakeLists.txt @@ -0,0 +1,15 @@ +# CMakeLists for data/helppics + +FILE(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") + +IF(UNIX) + IF(APPLE) + # FIXME correct path ? + #INSTALL(FILES ${images} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/) + ELSE() + # Assume linux + INSTALL(FILES ${images} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help/en/) + ENDIF() +ELSEIF(WIN32) + #INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) +ENDIF() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 3f232ab50..fd9c28118 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -16,15 +16,32 @@ SET(howto win32.compiling.1.2.txt ) +# User documentation +FILE(GLOB help "${CMAKE_CURRENT_BINARY_DIR}/*.html") + +IF(PERL_FOUND) + ADD_CUSTOM_TARGET( + docs ALL + ) + + ADD_CUSTOM_COMMAND( + COMMENT "generate the user documentation" + COMMAND perl ${PROJECT_SOURCE_DIR}/admin/gendoc.pl -v ${VERSION_RELEASE} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/data/doctemplates/*.template `find ${PROJECT_SOURCE_DIR}/src -name "*.cpp" -print` `find ./ -name "*.h" -print` + TARGET docs + ) +ENDIF() + # Install target IF(UNIX) IF(APPLE) INSTALL(FILES ${license} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/license) INSTALL(FILES ${howto} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/doc) + #INSTALL(FILES ${help} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/) ELSE() # Assume linux INSTALL(FILES ${license} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/license/) INSTALL(FILES ${howto} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/) + INSTALL(FILES ${help} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help/en/) ENDIF() ELSEIF(WIN32) #INSTALL(FILES ${license} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/license/) |