From: Ivailo Monev <xakepa10@laimg.moc>
Date: Fri, 12 Aug 2016 03:08:40 +0000 (+0000)
Subject: generic: build system cleanups
X-Git-Tag: 4.22.0~1450
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db65eb1e96e9b69511601a9427db284744275b1a;p=kde%2Fkde-workspace.git

generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 513830e7..6fada35e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ if(Q_WS_X11)
         TYPE REQUIRED
     )
 
-    find_package(X11 REQUIRED)
+    find_package(X11)
     set_package_properties(X11 PROPERTIES
         DESCRIPTION "X11 libraries"
         URL "http://www.x.org"
@@ -75,9 +75,6 @@ if(Q_WS_X11)
     if(NOT X11_Xkbfile_FOUND)
         message(FATAL_ERROR "The X11 keyboard layout library was not found. Required for building keyboard modules.")
     endif()
-    if(NOT X11_Xcomposite_FOUND)
-        message(FATAL_ERROR "The X11 composite library was not found. Required for building the plasma tray and notifications widgets.")
-    endif()
     if(NOT X11_Xdamage_FOUND)
         message(FATAL_ERROR "The X11 damaged region extension library was not found. Required for compositing support in KWin.")
     endif()
diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt
index 3486001a..8bbf18c3 100644
--- a/kscreensaver/kdesavers/CMakeLists.txt
+++ b/kscreensaver/kdesavers/CMakeLists.txt
@@ -4,7 +4,10 @@ add_definitions(-DEIGEN2_SUPPORT)
 
 option(KSCREENSAVER_SOUND_SUPPORT "Build with sound support" OFF)
 
-include_directories(${KDE4WORKSPACE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
+if(OPENGL_FOUND)
+    include_directories(${OPENGL_INCLUDE_DIR})
+endif()
 
 add_subdirectory( data )
 macro_optional_add_subdirectory( asciiquarium )
diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt
index b8db389e..38cd4c3c 100644
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
@@ -32,14 +32,14 @@ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp)
 add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
 
 target_link_libraries(taskmanager processcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} kephal)
-if (X11_Xfixes_FOUND)
-  target_link_libraries(taskmanager ${X11_Xfixes_LIB})
+if(X11_Xfixes_FOUND)
+    target_link_libraries(taskmanager ${X11_Xfixes_LIB})
 endif (X11_Xfixes_FOUND)
-if (X11_Xrender_FOUND)
-  target_link_libraries(taskmanager ${X11_Xrender_LIB})
+if(X11_Xrender_FOUND)
+    target_link_libraries(taskmanager ${X11_Xrender_LIB})
 endif (X11_Xrender_FOUND)
-if (X11_Xcomposite_FOUND)
-  target_link_libraries(taskmanager ${X11_Xcomposite_LIB})
+if(X11_Xcomposite_FOUND)
+    target_link_libraries(taskmanager ${X11_Xcomposite_LIB})
 endif (X11_Xcomposite_FOUND)
 
 set_target_properties(taskmanager PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
diff --git a/plasma/applets/systemtray/CMakeLists.txt b/plasma/applets/systemtray/CMakeLists.txt
index faa09e19..31bbd2f7 100644
--- a/plasma/applets/systemtray/CMakeLists.txt
+++ b/plasma/applets/systemtray/CMakeLists.txt
@@ -40,10 +40,15 @@ target_link_libraries(plasma_applet_systemtray
     ${X11_LIBRARIES}
     ${X11_Xrender_LIB}
     ${X11_Xfixes_LIB}
-    ${X11_Xdamage_LIB}
-    ${X11_Xcomposite_LIB}
 )
 
+if(X11_Xdamage_FOUND)
+    target_link_libraries(plasma_applet_systemtray ${X11_Xdamage_LIB})
+endif()
+if(X11_Xcomposite_FOUND)
+    target_link_libraries(plasma_applet_systemtray ${X11_Xcomposite_LIB})
+endif()
+
 install(TARGETS plasma_applet_systemtray DESTINATION ${PLUGIN_INSTALL_DIR})
 install(DIRECTORY "package/" DESTINATION "${DATA_INSTALL_DIR}/${data_install_dir}")
 install(FILES plasma-applet-systemtray.desktop DESTINATION ${SERVICES_INSTALL_DIR})