From 055e4228a91f9957771e44cbdc540f20b2c3aa17 Mon Sep 17 00:00:00 2001 From: Andreas Fink Date: Sat, 6 Nov 2010 22:22:48 +0000 Subject: [PATCH] *add* call gtk-update-cache on install --- CMakeLists.txt | 10 +++++----- src/tint2conf/CMakeLists.txt | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd94435..b6a2162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,17 +65,17 @@ if( ENABLE_BATTERY ) add_definitions( -DENABLE_BATTERY ) endif( ENABLE_BATTERY ) +set( MANDIR share/man CACHE PATH "Directory for man pages" ) +set( DATADIR share CACHE PATH "Directory for shared data" ) +set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" ) +set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" ) + if( ENABLE_TINT2CONF ) add_definitions( -DHAVE_VERSION_H ) add_subdirectory( src/tint2conf ) add_dependencies( tint2conf version ) endif( ENABLE_TINT2CONF ) -set( MANDIR share/man CACHE PATH "Directory for man pages" ) -set( DATADIR share CACHE PATH "Directory for shared data" ) -set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" ) -set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" ) - add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_svnrev.sh" "\"${PROJECT_SOURCE_DIR}\"" ) link_directories( ${X11_LIBRARY_DIRS} diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt index c44ad1e..76f8069 100644 --- a/src/tint2conf/CMakeLists.txt +++ b/src/tint2conf/CMakeLists.txt @@ -35,6 +35,10 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GTK2_LIBRARIES} ) +if ( NOT DATADIR ) + set( DATADIR share ) +endif( NOT DATADIR ) + add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" ) set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread" ) set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" ) @@ -43,3 +47,4 @@ install( TARGETS tint2conf DESTINATION bin ) install( PROGRAMS tintwizard.py DESTINATION bin ) install( FILES taskbar.svg DESTINATION share/icons/hicolor/scalable/apps ) install( FILES tint2conf.desktop DESTINATION share/applications ) +install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) -- 2.43.0