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

*fix* do not set LDFLAGS to --as-needed because this changes building behaviour which the user is not aware of

Browse source 
*fix* link librt only if it is found (issue 261)



git-svn-id: http://tint2.googlecode.com/svn/trunk@482 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85 2010-06-12 07:45:16 +00:00
parent 5521275bef
commit 99491c8f72
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -10,6 +10,7 @@ pkg_check_modules( CAIRO REQUIRED cairo )
pkg_check_modules( GLIB2 REQUIRED glib-2.0 ) pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 ) pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
pkg_check_modules( IMLIB2 REQUIRED imlib2 ) pkg_check_modules( IMLIB2 REQUIRED imlib2 )
find_library( RT_LIBRARY rt )
check_library_exists( "${IMLIB2_LIBRARIES}" "imlib_context_set_display" "${IMLIB2_LIBRARY_DIRS}" 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 ) if( NOT IMLIB_BUILD_WITH_X )
@ -61,7 +62,6 @@ if( ENABLE_TINT2CONF )
add_dependencies( tint2conf version ) add_dependencies( tint2conf version )
endif( ENABLE_TINT2CONF ) endif( ENABLE_TINT2CONF )
set( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "Directory for man pages" ) set( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "Directory for man pages" )
set( DATADIR ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Directory for shared data" ) set( DATADIR ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Directory for shared data" )
set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" ) set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
@ -84,12 +84,14 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
${CAIRO_LIBRARIES} ${CAIRO_LIBRARIES}
${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}
${GOBJECT2_LIBRARIES} ${GOBJECT2_LIBRARIES}
${IMLIB2_LIBRARIES} ${IMLIB2_LIBRARIES} )
rt ) if( RT_LIBRARY )
target_link_libraries( tint2 ${RT_LIBRARY} )
endif( RT_LIBRARY )
add_dependencies(tint2 version) add_dependencies(tint2 version)
set_target_properties(tint2 PROPERTIES COMPILE_FLAGS -Wall) set_target_properties(tint2 PROPERTIES COMPILE_FLAGS -Wall)
set_target_properties(tint2 PROPERTIES LINK_FLAGS -Wl,--as-needed) #set_target_properties(tint2 PROPERTIES LINK_FLAGS -Wl,--as-needed)
install( TARGETS tint2 DESTINATION bin ) install( TARGETS tint2 DESTINATION bin )
install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 ) install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )

2
src/tint2conf/CMakeLists.txt
View file

@ -29,7 +29,7 @@ target_link_libraries( tint2conf ${X11_LIBRARIES}
${GTK2_LIBRARIES} ) ${GTK2_LIBRARIES} )
set_target_properties(tint2conf PROPERTIES COMPILE_FLAGS -Wall) set_target_properties(tint2conf PROPERTIES COMPILE_FLAGS -Wall)
set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed) #set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed)
install( TARGETS tint2conf DESTINATION bin ) install( TARGETS tint2conf DESTINATION bin )
install( PROGRAMS tintwizard.py DESTINATION bin ) install( PROGRAMS tintwizard.py DESTINATION bin )