nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*fix* update dependencies for tint2 in README.source

Browse source 
*fix* install default_icon.png
*fix* correct checking if imlib2 is built with x support
*fix* use ENABLE_feature, rather than DISABLE_feature



git-svn-id: http://tint2.googlecode.com/svn/trunk@474 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85 2010-06-09 13:50:22 +00:00
parent 88d6fc8302
commit f8889fdbe0
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -2,7 +2,7 @@ project( tint2 )
cmake_minimum_required( VERSION 2.6 )
include( FindPkgConfig )
include( CheckFunctionExists )
include( CheckLibraryExists )
pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xrender xrandr )
pkg_check_modules( PANGOCAIRO REQUIRED pangocairo )
pkg_check_modules( PANGO REQUIRED pango )
@ -11,8 +11,7 @@ pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
pkg_check_modules( IMLIB2 REQUIRED imlib2 )
set( CMAKE_REQUIRED_FLAGS ${IMLIB2_LDFLAGS} ${IMLIB2_CFLAGS} )
check_function_exists( imlib_context_set_display IMLIB_BUILD_WITH_X )
check_library_exists( "${IMLIB2_LIBRARIES}" "imlib_context_set_display" "${IMLIB2_LIBRARY_DIRS}" IMLIB_BUILD_WITH_X )
if( NOT IMLIB_BUILD_WITH_X )
message( FATAL_ERROR "Imlib is not build with x support" )
endif( NOT IMLIB_BUILD_WITH_X )
@ -46,18 +45,18 @@ set( SOURCES src/config.c
src/util/timer.c
src/util/window.c )
option( DISABLE_BATTERY "Disable battery status plugin" OFF )
option( DISABLE_TINT2CONF "Disable tint2conf build, a GTK+2 theme switcher for tint2" OFF )
option( ENABLE_BATTERY "Enable battery status plugin" ON )
option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme switcher for tint2" ON )
option( ENABLE_EXAMPLES "Install additional tin2rc examples" OFF )
if( NOT DISABLE_BATTERY )
if( ENABLE_BATTERY )
set( SOURCES ${SOURCES} src/battery/battery.c )
add_definitions( -DENABLE_BATTERY )
endif( NOT DISABLE_BATTERY )
endif( ENABLE_BATTERY )
if( NOT DISABLE_TINT2CONF )
if( ENABLE_TINT2CONF )
add_subdirectory( src/tint2conf )
endif( NOT DISABLE_TINT2CONF )
endif( ENABLE_TINT2CONF )
set( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "Directory for man pages" )
@ -88,6 +87,7 @@ set_target_properties(tint2 PROPERTIES LINK_FLAGS -Wl,--as-needed)
install( TARGETS tint2 DESTINATION bin )
install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
install( FILES AUTHORS ChangeLog README DESTINATION ${DOCDIR} )
if( ENABLE_EXAMPLES )
file( GLOB SAMPLEFILES sample/*.tint2rc )

2
README.source
View file

@ -1,4 +1,4 @@
DEPENDENCIES:
cairo (whit X support), pango, glib2, libX11, Xinerama, Xrandr, Xrender, Xcomposite, imlib2 (with X support)
cairo (whit X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage imlib2 (with X support)
you might need -dev packages on debian