X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftests%2FCMakeLists.txt;h=8b0c6d5180669d2ae32ea2f18b87d43c103a35bc;hb=19b840ae23a888300f9a5c03971351b546cce93d;hp=d440bf68798a73d7e2a7a5585c75cd217abbd0dc;hpb=7910502b8e38d0aaa7cb42340c3f04b2aa5f6db0;p=lyx.git

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d440bf6879..8b0c6d5180 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -5,10 +5,10 @@
 #
 
 set(check_layout_SOURCES)
-foreach(_f insets/InsetLayout.cpp Color.cpp Counters.cpp Floating.cpp
+foreach(_f insets/InsetLayout.cpp CiteEnginesList.cpp Color.cpp Counters.cpp Floating.cpp
        FloatList.cpp FontInfo.cpp Layout.cpp LayoutFile.cpp Lexer.cpp
        ModuleList.cpp Spacing.cpp TextClass.cpp tests/check_layout.cpp
-       tests/boost.cpp tests/dummy_functions.cpp)
+       tests/boost.cpp support/tests/dummy_functions.cpp)
   list(APPEND check_layout_SOURCES "${TOP_SRC_DIR}/src/${_f}")
 endforeach()
 
@@ -38,11 +38,19 @@ foreach(bns ${layout_files} ${module_files})
   if("${_checktype}" STREQUAL "module")
     file(WRITE "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "#% Do not delete the line below; configure depends on this\n")
     file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "#  \\DeclareLaTeXClass{test${bn}}\n")
-
-    file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "Format 5\n")
+    file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "Format 63\n")
+    file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "Style Standard\n")
+    file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" " LabelType No_Label\n")
+    file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" " Category MainText\n")
+    file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "End\n")
     file(APPEND "${LYX_TESTS_USERDIR}/layouts/test${bn}.layout" "Input ${bns}\n")
     add_test(NAME "check_layout/${bns}"
-      COMMAND env LYX_USERDIR_22x=${LYX_TESTS_USERDIR} $<TARGET_FILE:check_layout> "${LYX_TESTS_USERDIR}/layouts/test${bn}" "${CMAKE_CURRENT_BINARY_DIR}/${bn}.out${_checktype}")
+      COMMAND ${CMAKE_COMMAND}
+	"-DCheckLayout=$<TARGET_FILE:check_layout>"
+	"-DModule=${LYX_TESTS_USERDIR}/layouts/test${bn}"
+	"-DOutput=${CMAKE_CURRENT_BINARY_DIR}/${bn}.out${_checktype}"
+	-P "${TOP_SRC_DIR}/src/tests/check_layout.cmake")
+    set_tests_properties("check_layout/${bns}" PROPERTIES ENVIRONMENT ${LYX_USERDIR_VER}=${LYX_TESTS_USERDIR})
   else()
     add_test(NAME "check_layout/${bns}"
       COMMAND check_layout "${TOP_SRC_DIR}/lib/layouts/${bn}" "${CMAKE_CURRENT_BINARY_DIR}/${bn}.out${_checktype}")
@@ -53,7 +61,7 @@ endforeach()
 set(check_ExternalTransforms_SOURCES)
 foreach(_f graphics/GraphicsParams.cpp insets/ExternalTransforms.cpp
 	Length.cpp lengthcommon.cpp tests/check_ExternalTransforms.cpp
-	tests/boost.cpp tests/dummy_functions.cpp)
+	tests/boost.cpp support/tests/dummy_functions.cpp)
     list(APPEND check_ExternalTransforms_SOURCES ${TOP_SRC_DIR}/src/${_f})
 endforeach()
 
@@ -75,14 +83,10 @@ add_test(NAME "check_ExternalTransforms"
 	-P "${TOP_SRC_DIR}/src/support/tests/supporttest.cmake")
 add_dependencies(lyx_run_tests check_ExternalTransforms)
 
-set(check_ExternalTransforms_SOURCES)
-foreach(_f graphics/GraphicsParams.cpp insets/ExternalTransforms.cpp
-	Length.cpp lengthcommon.cpp tests/check_ExternalTransforms.cpp
-	tests/boost.cpp tests/dummy_functions.cpp)
-    list(APPEND check_ExternalTransforms_SOURCES ${TOP_SRC_DIR}/src/${_f})
+set(check_Length_SOURCES)
+foreach(_f Length.cpp lengthcommon.cpp tests/check_Length.cpp tests/boost.cpp support/tests/dummy_functions.cpp)
+  list(APPEND check_Length_SOURCES ${TOP_SRC_DIR}/src/${_f})
 endforeach()
-
-include_directories(${TOP_SRC_DIR}/src/tests)
 add_executable(check_Length ${check_Length_SOURCES})
 
 target_link_libraries(check_Length support
@@ -100,3 +104,25 @@ add_test(NAME "check_Length"
 	-P "${TOP_SRC_DIR}/src/support/tests/supporttest.cmake")
 add_dependencies(lyx_run_tests check_Length)
 
+include_directories(${TOP_SRC_DIR}/src/tests)
+set(check_ListingsCaption_SOURCES)
+foreach(_f tests/check_ListingsCaption.cpp tests/boost.cpp support/tests/dummy_functions.cpp)
+  list(APPEND check_ListingsCaption_SOURCES ${TOP_SRC_DIR}/src/${_f})
+endforeach()
+add_executable(check_ListingsCaption ${check_ListingsCaption_SOURCES})
+
+target_link_libraries(check_ListingsCaption support
+	${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
+lyx_target_link_libraries(check_ListingsCaption Magic)
+
+add_dependencies(lyx_run_tests check_ListingsCaption)
+set_target_properties(check_ListingsCaption PROPERTIES FOLDER "tests/src")
+target_link_libraries(check_ListingsCaption ${ICONV_LIBRARY})
+
+add_test(NAME "check_ListingsCaption"
+  COMMAND ${CMAKE_COMMAND} -DCommand=$<TARGET_FILE:check_ListingsCaption>
+	"-DInput=${TOP_SRC_DIR}/src/tests/regfiles/ListingsCaption"
+	"-DOutput=${CMAKE_CURRENT_BINARY_DIR}/ListingsCaption_data"
+	-P "${TOP_SRC_DIR}/src/support/tests/supporttest.cmake")
+add_dependencies(lyx_run_tests check_ListingsCaption)
+