# HG changeset patch # User Alpar Juttner # Date 2009-02-04 09:39:06 # Node ID 97070bd10b98d12ba3ceb35dcfd042015f8c4639 # Parent b1ef32ab39f33df3e5a5da7049a608a41aaab09b CMAKE config improvements - install docs in share/doc/ - look for newer versions of Ghostscript diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu") SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu") SET(CPACK_NSIS_CREATE_ICONS_EXTRA " - CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\" + CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\" ") SET(CPACK_NSIS_DELETE_ICONS_EXTRA " !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP diff --git a/cmake/FindGhostscript.cmake b/cmake/FindGhostscript.cmake --- a/cmake/FindGhostscript.cmake +++ b/cmake/FindGhostscript.cmake @@ -3,7 +3,7 @@ FIND_PROGRAM(GHOSTSCRIPT_EXECUTABLE NAMES gs gswin32c PATHS "$ENV{ProgramFiles}/gs" - PATH_SUFFIXES gs8.61/bin gs8.62/bin + PATH_SUFFIXES gs8.61/bin gs8.62/bin gs8.63/bin gs8.64/bin gs8.65/bin DOC "Ghostscript: PostScript and PDF language interpreter and previewer." ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -37,6 +37,6 @@ ENDIF(UNIX) INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ - DESTINATION doc + DESTINATION share/doc COMPONENT html_documentation) ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)