[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace] /: if there is X11 but not sm, fail cmake
From:       Marco Martin <notmart () gmail ! com>
Date:       2014-04-07 16:20:15
Message-ID: E1WXCHP-00036B-0n () scm ! kde ! org
[Download RAW message or body]

Git commit 5e41b98201a30961fb3ebac804ba491bd97f4610 by Marco Martin.
Committed on 07/04/2014 at 16:19.
Pushed by mart into branch 'master'.

if there is X11 but not sm, fail cmake

BUG:332893

M  +3    -1    CMakeLists.txt

http://commits.kde.org/plasma-workspace/5e41b98201a30961fb3ebac804ba491bd97=
f4610

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dfe00c..f69213b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,9 @@ if(X11_FOUND)
   find_package(XCB REQUIRED COMPONENTS XCB XFIXES DAMAGE COMPOSITE SHAPE S=
YNC RENDER RANDR KEYSYMS IMAGE SHM XTEST)
   set_package_properties(XCB PROPERTIES TYPE REQUIRED)
   find_package(XCB COMPONENTS ICCCM)
-  add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test=
 applications for KWin")
+  if(NOT X11_SM_FOUND)
+    message(FATAL_ERROR "\nThe X11 Session Management (SM) development pac=
kage could not be found.\nPlease install libSM.\n")
+  endif(NOT X11_SM_FOUND)
 =

   find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
 endif()
[prev in list] [next in list] [prev in thread] [next in thread]