X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2FCMakeLists.txt;h=485e9767eee2aa6ecf2dcaf95cb1321bd23677b1;hb=d1a41a9bdc8da0ee402ecffc89079bcc92e6cf36;hp=3dd4213842e8eb483bec7819285f74ad114b0bd3;hpb=d97c34f4fe92891e8da07bc5e1285743cbd13b06;p=lyx.git

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 3dd4213842..485e9767ee 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -67,7 +67,7 @@ if(QT_USES_X11)
     message(STATUS "cmake build is therefore omitting keytests")
   endif()
 
-  if(Missing)
+  if(Missing OR NOT LYX_ENABLE_KEYTESTS)
     set(_runtest FALSE)
   else()
     project(keytest)
@@ -78,11 +78,12 @@ if(QT_USES_X11)
     set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py")
     file(GLOB TESTST RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.txt")
     file(GLOB TESTSS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.sh")
-    set(_firsttxt hello-world-in.txt first-time-in.txt)
+    set(_firsttxt first-time-in.txt hello-world-in.txt)
     foreach(_f ${_firsttxt})
       list(FIND TESTST ${_f} _ff)
       if(NOT _ff GREATER -1)
         set(_runtest FALSE)
+        break()
       endif()
     endforeach()
     list(REMOVE_ITEM TESTST ${_firsttxt})
@@ -104,6 +105,7 @@ if(QT_USES_X11)
         -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")