diff options
| author | aneejit1 <[email protected]> | 2020-06-10 20:42:24 +0000 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2020-06-26 17:36:36 +0900 |
| commit | 25e388d0c56cfc108369a3e47f6f4a0faf0f4089 (patch) | |
| tree | aa442fd10e9a486ebf78d4fe95935349332ae57e | |
| parent | 6036470326e03e262bcd8e582acd849c0631e9c7 (diff) | |
| download | kmplayer-25e388d0c56cfc108369a3e47f6f4a0faf0f4089.tar.gz kmplayer-25e388d0c56cfc108369a3e47f6f4a0faf0f4089.zip | |
Add library paths to link_directories and supply correct Xtest check/variables
This resolves bug 3130
Signed-off-by: aneejit1 <[email protected]>
(cherry picked from commit abed871291535bede858e6f6acd4a4847b536e5b)
| -rw-r--r-- | ConfigureChecks.cmake | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 22 |
2 files changed, 23 insertions, 6 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 4326a17..5cb46aa 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -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 ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ceae060..412e376 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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} ) |