From 10ffbd787a60cd1b4d4dc8b5f04bb24b86c1cd7a Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 5 Jan 2014 10:02:29 +0100 Subject: [PATCH] Cmake build: White space + simplification --- development/autotests/check_load.cmake | 11 ++++------- development/autotests/export.cmake | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/development/autotests/check_load.cmake b/development/autotests/check_load.cmake index 967bb66989..4a22a27fa4 100644 --- a/development/autotests/check_load.cmake +++ b/development/autotests/check_load.cmake @@ -17,7 +17,7 @@ # -P "${TOP_SRC_DIR}/development/autotests/check_load.cmake" # -message(STATUS "Executing ${lyx} -batch ${LYXFILE}") +message(STATUS "Executing ${lyx} -batch -userdir \"${LYX_TESTS_USERDIR}\" ${LYXFILE}") set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}") set(ENV{LANG} "en") # to get all error-messages in english @@ -39,21 +39,18 @@ if(lyxerr) string(REGEX REPLACE "[\n]+" ";" foundErrors ${lyxerr}) foreach(_l ${foundErrors}) if(ConfigureOutput) - string(REGEX MATCHALL "LyX: Done!" _match ${_l}) - if(_match) + if(_l MATCHES "LyX: Done!") set(ConfigureOutput 0) endif() else() - string(REGEX MATCHALL "reconfiguring user directory" _match ${_l}) - if(_match) + if(_l MATCHES "reconfiguring user directory") set(ConfigureOutput 1) endif() endif() if(NOT ConfigureOutput) set(found 0) foreach(_r ${ignoreRegexp}) - string(REGEX MATCHALL "${_r}" _match ${_l}) - if(_match) + if(_l MATCHES "${_r}") set(found 1) break() endif() diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index 647b9ddc6e..56a3e82582 100755 --- a/development/autotests/export.cmake +++ b/development/autotests/export.cmake @@ -6,7 +6,7 @@ # # LYX_ROOT = ${TOP_SRC_DIR}/lib/{doc,examples,templates} # LYX_USERDIR_VER = Name of environment variable for the user directory -# lyx = +# lyx = # format = lyx16x|xhtml # extension = 16.lyx|xhtml # file = xxx -- 2.39.2