anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: White space + simplification

Browse Source
This commit is contained in:
Kornel Benko 2014-01-05 10:02:29 +01:00
parent cd88700c1c
commit 10ffbd787a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
development/autotests/check_load.cmake
View File

@ -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()

2
development/autotests/export.cmake
View File

@ -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