Fix screen display of parts and chapters in default classes

[lyx.git] / development / autotests / CMakeLists.txt

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 0ad195f71cf96dcbbb3d0bfd1143188aec084dd9..208e74be1a257f77c4a91b3d88a9bd5e131dfd24 100644 (file)
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -67,12 +67,18 @@ if(QT_USES_X11)
     message(STATUS "cmake build is therefore omitting keytests")
   endif()
 
-  if(Missing)
+  find_program(XVKBD_EXE NAMES "xvkbd")
+  if (XVKBD_EXE MATCHES "NOTFOUND")
+    message(STATUS "Missing xvkbd, omitting keytests")
+    list(APPEND Missing "xvkbd")
+  endif()
+
+  if(Missing OR NOT LYX_ENABLE_KEYTESTS)
     set(_runtest FALSE)
   else()
     project(keytest)
 
-    add_subdirectory(xvkbd)
+    #add_subdirectory(xvkbd)
 
     set(_runtest TRUE)
     set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py")
@@ -101,10 +107,12 @@ if(QT_USES_X11)
         -DKEYTEST_INFILE=${_tf}
         -DBINDIR=$<TARGET_FILE_DIR:${_lyx}>
         -DLYX=${_lyx}
+       -DXVKBD_EXE=${XVKBD_EXE}
         -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
         -DLYX_USERDIR_VER=${LYX_USERDIR_VER}
         -DKEYTEST_OUTFILE=${_t}-out.txt
         -DPACKAGE=${PACKAGE}
+       -DFRONTEND=${LYX_USE_QT}
         -DLOCALE_DIR=${LOCALE_DIR}
         -P ${TOP_SRC_DIR}/development/autotests/single-test.cmake)
       settestlabel(keytest/${_t} "key")