From cec16021dca6002f3885c7e90d54b9eda0321f9e Mon Sep 17 00:00:00 2001 From: aneejit1 Date: Wed, 17 Jun 2020 22:05:06 +0000 Subject: [PATCH] Add missing include/link directories In an environment where not everything is in /usr... - drkonqi/CMakeLists.txt requires the libr library path to be specified. - nsplugins/viewer/CMakeLists.txt requires the glib library path to be specified. - tdm/backend/CMakeLists.txt was missing the include and link directories for libXau and libXDMCP. - twin/compton-tde/CMakeLists.txt was missing include and link directories for the optionally selected libraries (libconfig, Xinerama, XRandR, OpenGL and PCRE). Signed-off-by: aneejit1 (cherry picked from commit 036992eec5a209107648729f10bcdce1825abbf2) --- drkonqi/CMakeLists.txt | 1 + nsplugins/viewer/CMakeLists.txt | 1 + tdm/backend/CMakeLists.txt | 4 ++++ twin/compton-tde/CMakeLists.txt | 14 ++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt index d335789b8..a2b643909 100644 --- a/drkonqi/CMakeLists.txt +++ b/drkonqi/CMakeLists.txt @@ -23,6 +23,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} + ${LIBR_LIBRARY_DIRS} ) diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt index e3149cadb..08a3778d7 100644 --- a/nsplugins/viewer/CMakeLists.txt +++ b/nsplugins/viewer/CMakeLists.txt @@ -20,6 +20,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} + ${GLIB2_LIBRARY_DIRS} ) diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt index bece8be72..8f11c4b34 100644 --- a/tdm/backend/CMakeLists.txt +++ b/tdm/backend/CMakeLists.txt @@ -16,10 +16,14 @@ include_directories( ${CMAKE_BINARY_DIR} ${DBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/tdm/kfrontend + ${XAU_INCLUDE_DIRS} + ${XDMCP_INCLUDE_DIRS} ) link_directories( ${DBUS_LIBRARY_DIRS} + ${XAU_LIBRARY_DIRS} + ${XDMCP_LIBRARY_DIRS} ) ##### tdm (executable) ########################## diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt index ebaf38f33..d432b533f 100644 --- a/twin/compton-tde/CMakeLists.txt +++ b/twin/compton-tde/CMakeLists.txt @@ -20,6 +20,20 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${DBUS_INCLUDE_DIRS} + ${LIBCONFIG_INCLUDE_DIRS} + ${XINERAMA_INCLUDE_DIRS} + ${XRANDR_INCLUDE_DIRS} + ${GL_INCLUDE_DIRS} + ${LIBPCRE_INCLUDE_DIRS} +) + +link_directories( + ${DBUS_LIBRARY_DIRS} + ${LIBCONFIG_LIBRARY_DIRS} + ${XINERAMA_LIBRARY_DIRS} + ${XRANDR_LIBRARY_DIRS} + ${GL_LIBRARY_DIRS} + ${LIBPCRE_LIBRARY_DIRS} )