diff --git a/CMakeLists.txt b/CMakeLists.txt index 0477db598c..29cfd69b74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ if(UNIX) # When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX. set(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.") set(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.") + SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.") endif(APPLE) endif(UNIX) @@ -47,6 +48,7 @@ if(WIN32) # When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX. set(KICAD_PLUGINS ${KICAD_BIN}/plugins) set(KICAD_DATA share CACHE PATH "Location of KiCad data files.") + SET(KICAD_DOCS doc) endif(WIN32) set(KICAD_DEMOS ${KICAD_DATA}/demos) @@ -103,3 +105,10 @@ add_subdirectory(polygon) add_subdirectory(demos) add_subdirectory(internat) add_subdirectory(template) + +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/install.txt DESTINATION ${KICAD_DOCS} COMPONENT resources) +if(UNIX) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/share/kicad.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications COMPONENT resources) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bitmaps/kicad.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps COMPONENT resources) +endif(UNIX) + diff --git a/bitmaps/kicad.png b/bitmaps/kicad.png new file mode 100644 index 0000000000..6c33035039 Binary files /dev/null and b/bitmaps/kicad.png differ diff --git a/include/build_version.h b/include/build_version.h index 002a7d15a3..bf047a0500 100644 --- a/include/build_version.h +++ b/include/build_version.h @@ -5,7 +5,7 @@ COMMON_GLOBL wxString g_BuildVersion #ifdef EDA_BASE - (wxT("(20080311-r876)")) + (wxT("(20080313-r890)")) #endif ; diff --git a/share/kicad.desktop b/share/kicad.desktop new file mode 100644 index 0000000000..2cc3df7ebd --- /dev/null +++ b/share/kicad.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +GenericName[en]=KiCad - project manager +GenericName[ru]=KiCad - менеджер проектов +Comment[en]=Electrical schematic and PCB design suite +Comment[ru]=Комплекс для разработки электрических схем и печатных плат +MimeType=text/pro +Name=KiCad +Exec=kicad +Icon=kicad +Type=Application +Terminal=false +Categories=Scientific; +