From: Kornel Benko <kornel@lyx.org>
Date: Fri, 12 Jul 2013 09:21:13 +0000 (+0200)
Subject: Cmake build xvkbd: add xmu to the list of libraries to bind with.
X-Git-Tag: 2.1.0beta1~1
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f4bc391925cdacd35143333c50b914b108fe9876;p=features.git

Cmake build xvkbd: add xmu to the list of libraries to bind with.
This is needed (because of DSO) on ubuntu 13.04.
---

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 9933a4aef5..10abf4c447 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -29,33 +29,32 @@ if(Q_WS_X11)
   endif()
   find_package(PkgConfig)
   if(PKG_CONFIG_FOUND)
-    pkg_check_modules(XAWLIB xaw7)
-    if (XAWLIB_LIBRARIES)
-      list(APPEND XVFBDLIBS ${XAWLIB_LIBRARIES})
-    else()
-      list(APPEND Missing Xaw7)
-    endif()
-    pkg_check_modules(XTEST xtst)
-    if (XTEST_LIBRARIES)
-      list(APPEND XVFBDLIBS ${XTEST_LIBRARIES})
-    else()
-      list(APPEND Missing xtst)
-    endif()
+    foreach(_lb "xaw7" "xmu" "xtst")
+      pkg_check_modules(${_lb}LIB ${_lb})
+      if(${_lb}LIB_LIBRARIES)
+        list(APPEND XVFBDLIBS ${${_lb}LIB_LIBRARIES})
+      else()
+        list(APPEND Missing ${_lb})
+      endif()
+    endforeach()
   else()
-    find_library(XAW7LIB "Xaw7")
-    if(XAW7LIB)
-      list(APPEND XVFBDLIBS ${XAW7LIB})
-    else()
-      list(APPEND Missing Xaw7)
-    endif()
+    foreach(_lb "Xaw7" "Xmu")
+      find_library(${_lb}LIB ${_lb})
+      if(${_lb}LIB)
+        list(APPEND XVFBDLIBS ${${_lb}LIB})
+      else()
+        list(APPEND Missing ${_lb})
+      endif()
+    endforeach()
     foreach(_lb Xt XTest X11)
       if(X11_${_lb}_LIB)
-	list(APPEND XVFBDLIBS ${X11_${_lb}_LIB})
+        list(APPEND XVFBDLIBS ${X11_${_lb}_LIB})
       else()
-	list(APPEND Missing ${_lb})
+        list(APPEND Missing ${_lb})
       endif()
     endforeach()
   endif()
+  list(REMOVE_DUPLICATES XVFBDLIBS)
 
   if(Missing)
     message(STATUS "Missing Libraries or programms to create xvkbd: ${Missing}")