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 9d7629b7a89ac27e090ddf4e262384b40d01a42e..cf7bd9ddd7735c4d9034f89937ad4a045cbb65a6 100644 (file)
--- 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 1ba14f68e8339e6732ed187b33a10d74301a8944..51a08db81884447d7d8ddfb38f4035cce527a10b 100644 (file)
--- 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)