Add library paths to link_directories and supply correct Xtest check/variables

This resolves bug 3130

Signed-off-by: aneejit1 <aneejit1@gmail.com>
pull/5/head
aneejit1 4 years ago
parent 952131b240
commit abed871291

@ -60,11 +60,12 @@ endif( WITH_EXPAT )
##### check for XTest
if( WITH_XTEST )
if( X11_XTest_FOUND )
pkg_search_module( X11_XTEST xtst )
if( X11_XTest_FOUND )
set( HAVE_XTEST 1 )
else()
else()
tde_message_fatal( "XTest support has been requested but xtest was not found on your system." )
endif()
endif()
endif( WITH_XTEST )

@ -17,7 +17,7 @@ include_directories(
${GSTREAMER_VIDEO_INCLUDE_DIRS}
${GSTREAMER_PLUGIN_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
${X11_XTest_INCLUDE_PATH}
${X11_XTEST_INCLUDE_DIRS}
${GDK2_INCLUDE_DIRS}
${GTK2_INCLUDE_DIRS}
${GLIB2_INCLUDE_DIRS}
@ -27,6 +27,22 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
${CAIRO_LIBRARY_DIRS}
${EXPAT_LIBRARY_DIRS}
${XINE_LIBRARY_DIRS}
${NSPR_LIBRARY_DIRS}
${DBUS_LIBRARY_DIRS}
${DBUS-TQT_LIBRARY_DIRS}
${GSTREAMER_LIBRARY_DIRS}
${GSTREAMER_VIDEO_LIBRARY_DIRS}
${GSTREAMER_PLUGIN_LIBRARY_DIRS}
${X11_LIBRARY_DIRS}
${X11_XTEST_LIBRARY_DIRS}
${XEXT_LIBRARY_DIRS}
${GDK2_LIBRARY_DIRS}
${GTK2_LIBRARY_DIRS}
${GLIB2_LIBRARY_DIRS}
${DBUS-GLIB_LIBRARY_DIRS}
)
@ -56,7 +72,7 @@ tde_add_library( kmplayercommon SHARED AUTOMOC
${EXPAT_LIBRARIES}
${XINE_LIBRARIES}
${X11_LIBRARIES}
${X11_XTest_LIB}
${X11_XTEST_LIBRARIES}
${NSPR_LIBRARIES}
${DBUS_LIBRARIES}
${GSTREAMER_LIBRARIES}
@ -78,7 +94,7 @@ tde_add_tdeinit_executable( ${PROJECT_NAME} AUTOMOC
LINK
tdecore-shared
kmplayercommon-shared
${X11_XTest_LIB}
${X11_XTEST_LIBRARIES}
)

Loading…
Cancel
Save