all repos — tint2 @ ba32d259a0100b51babfea621b0a70527a2a3848

fork of the tint2 desktop panel for my custom setup - only minimized windows across all desktops for the taskbar

*fix* IMLIB2_LDFLAGS not FLAGS
*fix* link_directories needs to be called before the target is created


git-svn-id: http://tint2.googlecode.com/svn/trunk@498 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
Andreas.Fink85 Andreas.Fink85@121b4492-b84c-0410-8b4c-0d4edfb3f3cc
commit

ba32d259a0100b51babfea621b0a70527a2a3848

parent

6d8a4604341159b3ee07a0988ca5947a50ab1d27

2 files changed, 8 insertions(+), 3 deletions(-)

jump to
M CMakeLists.txtCMakeLists.txt

@@ -12,7 +12,7 @@ pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )

pkg_check_modules( IMLIB2 REQUIRED imlib2 ) find_library( RT_LIBRARY rt ) -string( REPLACE ";" " " FLAGS_REPLACED "${FLAGS}" ) +string( REPLACE ";" " " FLAGS_REPLACED "${IMLIB2_LDFLAGS}" ) set( CMAKE_REQUIRED_FLAGS "${FLAGS_REPLACED}" ) check_library_exists( "${IMLIB2_LIBRARIES}" "imlib_context_set_display" "${IMLIB2_LIBRARY_DIRS}" IMLIB_BUILD_WITH_X ) if( NOT IMLIB_BUILD_WITH_X )

@@ -71,15 +71,14 @@ 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}\"" ) -add_executable(tint2 ${SOURCES}) link_directories( ${X11_LIBRARY_DIRS} - ${X11_LIBRARY_DIRS} ${PANGOCAIRO_LIBRARY_DIRS} ${PANGO_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${GOBJECT2_LIBRARY_DIRS} ${IMLIB2_LIBRARY_DIRS} ) +add_executable(tint2 ${SOURCES}) target_link_libraries( tint2 ${X11_LIBRARIES} ${PANGOCAIRO_LIBRARIES} ${PANGO_LIBRARIES}
M src/tint2conf/CMakeLists.txtsrc/tint2conf/CMakeLists.txt

@@ -21,6 +21,12 @@ set(SOURCES ../util/common.c

main.c properties.c theme_view.c ) +link_directories( ${X11_LIBRARY_DIRS} + ${GLIB2_LIBRARY_DIRS} + ${GOBJECT2_LIBRARY_DIRS} + ${IMLIB2_LIBRARY_DIRS} + ${GTHREAD2_LIBRARY_DIRS} + ${GTK2_LIBRARY_DIRS} ) add_executable( tint2conf ${SOURCES} ) target_link_libraries( tint2conf ${X11_LIBRARIES} ${GLIB2_LIBRARIES}