The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit f02f671dd0d22c293e4ab252e49b6e792b32ccfd
Author: Kornel Benko <kor...@lyx.org>
Date: Tue Dec 11 16:00:59 2012 +0100
Cmake build, autotests
Removed if no X11.
Because X11 is needed for xvkbd but not available on some platforms (even
if UNIX)
diff --git a/development/autotests/CMakeLists.txt
b/development/autotests/CMakeLists.txt
index 9d7629b..cf7bd9d 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -5,34 +5,37 @@
#
if(UNIX)
- project(autotests)
+ find_package(X11)
+ if(X11_FOUND)
+ project(autotests)
- add_subdirectory(xvkbd)
+ add_subdirectory(xvkbd)
- set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py")
- set(LYX_HOME "out-home")
- set(LYX_USERDIR "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}/.lyx")
- set(LOCALE_DIR "${CMAKE_CURRENT_BINARY_DIR}/locale")
- file(GLOB TESTST RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.txt")
- file(GLOB TESTSS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.sh")
- list(REMOVE_ITEM TESTST hello-world-in.txt first-time-in.txt)
- list(SORT TESTST)
- file(MAKE_DIRECTORY "${LYX_USERDIR}" "${LOCALE_DIR}")
+ set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py")
+ set(LYX_HOME "out-home")
+ set(LYX_USERDIR "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}/.lyx")
+ set(LOCALE_DIR "${CMAKE_CURRENT_BINARY_DIR}/locale")
+ file(GLOB TESTST RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.txt")
+ file(GLOB TESTSS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.sh")
+ list(REMOVE_ITEM TESTST hello-world-in.txt first-time-in.txt)
+ list(SORT TESTST)
+ file(MAKE_DIRECTORY "${LYX_USERDIR}" "${LOCALE_DIR}")
- foreach(_tf first-time-in.txt hello-world-in.txt ${TESTST})
- string(REGEX REPLACE "-in\\.(txt|sh)" "" _t ${_tf})
- add_test(NAME "auto_${_t}"
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
- COMMAND ${CMAKE_COMMAND}
+ foreach(_tf first-time-in.txt hello-world-in.txt ${TESTST})
+ string(REGEX REPLACE "-in\\.(txt|sh)" "" _t ${_tf})
+ add_test(NAME "auto_${_t}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
+ COMMAND ${CMAKE_COMMAND}
-DAUTOTEST_ROOT=${TOP_SRC_DIR}/development/autotests
-DKEYTEST_INFILE=${_tf}
-DBINDIR=${TOP_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
-DKEYTEST_OUTFILE=${_t}-out.txt
-P ${TOP_SRC_DIR}/development/autotests/single-test.cmake)
- endforeach()
- add_test(NAME lyx_export
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
- COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}
-Dlyx=${TOP_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/lyx -P
"${TOP_SRC_DIR}/development/autotests/export.cmake")
- set_tests_properties(lyx_export PROPERTIES DEPENDS lyx)
+ endforeach()
+ add_test(NAME lyx_export
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
+ COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}
-Dlyx=${TOP_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/lyx -P
"${TOP_SRC_DIR}/development/autotests/export.cmake")
+ set_tests_properties(lyx_export PROPERTIES DEPENDS lyx)
+ endif()
endif()
diff --git a/development/autotests/xvkbd/CMakeLists.txt
b/development/autotests/xvkbd/CMakeLists.txt
index 1ba14f6..51a08db 100644
--- a/development/autotests/xvkbd/CMakeLists.txt
+++ b/development/autotests/xvkbd/CMakeLists.txt
@@ -5,7 +5,6 @@
#
project(xvkbd)
-find_package(X11 REQUIRED)
find_package(PkgConfig)
add_definitions(-DUSE_XTEST -DUSE_I18N)
-----------------------------------------------------------------------
Summary of changes:
development/autotests/CMakeLists.txt | 45 +++++++++++++++-------------
development/autotests/xvkbd/CMakeLists.txt | 1 -
2 files changed, 24 insertions(+), 22 deletions(-)
hooks/post-receive
--
The LyX Source Repository
