gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
0 3 0
merge default
2 files changed with 3 insertions and 3 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -91,17 +91,17 @@
91 91
  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
92 92
  #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
93 93
  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
94 94
  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
95 95
  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
96 96
  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
97 97
  SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
98 98
  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
99
    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
99
    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
100 100
    ")
101 101
  SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
102 102
    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
103 103
    Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
104 104
    ")
105 105

	
106 106
  INCLUDE(CPack)
107 107
ENDIF(WIN32)
Ignore white space 16 line context
1 1
INCLUDE(FindPackageHandleStandardArgs)
2 2

	
3 3
FIND_PROGRAM(GHOSTSCRIPT_EXECUTABLE
4 4
  NAMES gs gswin32c
5 5
  PATHS "$ENV{ProgramFiles}/gs"
6
  PATH_SUFFIXES gs8.61/bin gs8.62/bin
6
  PATH_SUFFIXES gs8.61/bin gs8.62/bin gs8.63/bin gs8.64/bin gs8.65/bin
7 7
  DOC "Ghostscript: PostScript and PDF language interpreter and previewer."
8 8
)
9 9

	
10 10
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ghostscript DEFAULT_MSG GHOSTSCRIPT_EXECUTABLE)
Ignore white space 6 line context
... ...
@@ -33,11 +33,11 @@
33 33
      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
34 34
      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
35 35
      COMMAND if exist html rmdir /s /q html
36 36
      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
37 37
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
38 38
  ENDIF(UNIX)
39 39
  INSTALL(
40 40
    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
41
    DESTINATION doc
41
    DESTINATION share/doc
42 42
    COMPONENT html_documentation)
43 43
ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
0 comments (0 inline)