Bump version && added ENABLE_NUMIX Cmake switch.

This commit is contained in:
Martin Rotter 2015-10-18 10:50:23 +02:00
parent 7c690c6401
commit 3ef768c86b

View File

@ -65,8 +65,8 @@ project(rssguard)
set(APP_NAME "RSS Guard") set(APP_NAME "RSS Guard")
set(APP_LOW_NAME "rssguard") set(APP_LOW_NAME "rssguard")
set(APP_VERSION "2.5.2") set(APP_VERSION "2.5.3")
set(FILE_VERSION "2,5,2,0") set(FILE_VERSION "2,5,3,0")
set(APP_AUTHOR "Martin Rotter") set(APP_AUTHOR "Martin Rotter")
set(APP_URL "http://bitbucket.org/skunkos/rssguard") set(APP_URL "http://bitbucket.org/skunkos/rssguard")
set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues") set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues")
@ -83,6 +83,7 @@ endif(APPLE)
# Options declaration. # Options declaration.
option(USE_QT_5 "Use Qt 5 for building" OFF) option(USE_QT_5 "Use Qt 5 for building" OFF)
option(ENABLE_NUMIX "Install Numix icon theme" ON)
if(OS2) if(OS2)
option(ENABLE_OS2_RC "Compile application icon on OS/2" OFF) option(ENABLE_OS2_RC "Compile application icon on OS/2" OFF)
@ -112,6 +113,7 @@ endif(${APPLE})
message(STATUS "") message(STATUS "")
message(STATUS "[${APP_LOW_NAME}] ==== Options summary ====") message(STATUS "[${APP_LOW_NAME}] ==== Options summary ====")
message(STATUS "[${APP_LOW_NAME}] Use Qt 5 for building -> ${USE_QT_5}") message(STATUS "[${APP_LOW_NAME}] Use Qt 5 for building -> ${USE_QT_5}")
message(STATUS "[${APP_LOW_NAME}] Install Numix icon theme -> ${ENABLE_NUMIX}")
if(OS2) if(OS2)
message(STATUS "[${APP_LOW_NAME}] Compile application icon on OS/2 -> ${ENABLE_OS2_RC}") message(STATUS "[${APP_LOW_NAME}] Compile application icon on OS/2 -> ${ENABLE_OS2_RC}")
@ -817,7 +819,11 @@ if(WIN32 OR OS2)
endif(WIN32 AND NOT USE_QT_5) endif(WIN32 AND NOT USE_QT_5)
install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons) install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons)
if(ENABLE_NUMIX)
install(DIRECTORY resources/graphics/icons/numix DESTINATION ./icons) install(DIRECTORY resources/graphics/icons/numix DESTINATION ./icons)
endif(ENABLE_NUMIX)
install(DIRECTORY resources/skins/base install(DIRECTORY resources/skins/base
DESTINATION ./skins) DESTINATION ./skins)
install(DIRECTORY resources/misc install(DIRECTORY resources/misc
@ -863,7 +869,11 @@ elseif(APPLE)
install(DIRECTORY resources/initial_feeds DESTINATION ${APPLE_PREFIX}) install(DIRECTORY resources/initial_feeds DESTINATION ${APPLE_PREFIX})
install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ${APPLE_PREFIX}/icons) install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ${APPLE_PREFIX}/icons)
if(ENABLE_NUMIX)
install(DIRECTORY resources/graphics/icons/numix DESTINATION ${APPLE_PREFIX}/icons) install(DIRECTORY resources/graphics/icons/numix DESTINATION ${APPLE_PREFIX}/icons)
endif(ENABLE_NUMIX)
install(DIRECTORY resources/skins DESTINATION ${APPLE_PREFIX}) install(DIRECTORY resources/skins DESTINATION ${APPLE_PREFIX})
install(DIRECTORY resources/misc DESTINATION ${APPLE_PREFIX}) install(DIRECTORY resources/misc DESTINATION ${APPLE_PREFIX})
install(FILES resources/graphics/${APP_LOW_NAME}_128.png DESTINATION ${APPLE_PREFIX} RENAME ${APP_LOW_NAME}.png) install(FILES resources/graphics/${APP_LOW_NAME}_128.png DESTINATION ${APPLE_PREFIX} RENAME ${APP_LOW_NAME}.png)
@ -876,7 +886,11 @@ elseif(UNIX)
install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin) install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin)
install(DIRECTORY resources/initial_feeds DESTINATION share/${APP_LOW_NAME}) install(DIRECTORY resources/initial_feeds DESTINATION share/${APP_LOW_NAME})
install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION share/${APP_LOW_NAME}/icons) install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION share/${APP_LOW_NAME}/icons)
if(ENABLE_NUMIX)
install(DIRECTORY resources/graphics/icons/numix DESTINATION share/${APP_LOW_NAME}/icons) install(DIRECTORY resources/graphics/icons/numix DESTINATION share/${APP_LOW_NAME}/icons)
endif(ENABLE_NUMIX)
install(DIRECTORY resources/skins/base DESTINATION share/${APP_LOW_NAME}/skins) install(DIRECTORY resources/skins/base DESTINATION share/${APP_LOW_NAME}/skins)
install(DIRECTORY resources/misc DESTINATION share/${APP_LOW_NAME}) install(DIRECTORY resources/misc DESTINATION share/${APP_LOW_NAME})
install(FILES ${CMAKE_BINARY_DIR}/resources/desktop/${APP_LOW_NAME}.desktop DESTINATION share/applications) install(FILES ${CMAKE_BINARY_DIR}/resources/desktop/${APP_LOW_NAME}.desktop DESTINATION share/applications)