Remove dependency on NO_LAYOUT_CSS #define in Layout.cpp

[lyx.git] / src / support / tests / CMakeLists.txt

diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index 8452e08fde8e318d003f7b0e08af10814f63ebc6..eac5aa79f23b1e254f431c966296a46ef1e51029 100644 (file)
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ macro(sources _program)
        endforeach()
        set(${_program}_SOURCES ${_tmplist})
        add_executable(${_program} ${_tmplist})
-       target_link_libraries(${_program} support ${intl_link}
+       target_link_libraries(${_program} support
                ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
                ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
 endmacro()
@@ -24,8 +24,7 @@ include_directories(
        ${TOP_SRC_DIR}/src/support/tests
        ${QT_INCLUDES}
        ${ICONV_INCLUDE_DIR}
-       ${ZLIB_INCLUDE_DIR}
-       ${LIBINTL_INCLUDE_DIR})
+       ${ZLIB_INCLUDE_DIR})
 
 
 set(check_PROGRAMS check_convert check_filetools check_lstrings)
@@ -37,15 +36,18 @@ foreach(_src ${check_PROGRAMS})
        sources(${_src} ${_src}.cpp dummy_functions.cpp boost.cpp)
        string(REPLACE "check_" "" _srcx ${_src})
        set(src_data_file "${TOP_SRC_DIR}/src/support/tests/regfiles/${_srcx}")
+       if (MSVC AND EXISTS "${src_data_file}.MSVC")
+               set(src_data_file "${src_data_file}.MSVC")
+       endif()
        set(created_data_file "${CMAKE_CURRENT_BINARY_DIR}/regfiles/${_src}_data")
-        add_test(NAME support/${_srcx}/build
-         COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target ${_src})
-       add_test(NAME support/${_srcx}/createdata
-         COMMAND ${_src} > "${created_data_file}")
-       add_test(NAME support/${_srcx}/compare
-         COMMAND ${CMAKE_COMMAND} -E compare_files "${src_data_file}" "${created_data_file}")
-       set_tests_properties(support/${_srcx}/createdata PROPERTIES DEPENDS support/${_srcx}/build )
-       set_tests_properties(support/${_srcx}/compare PROPERTIES DEPENDS support/${_srcx}/createdata)
+        add_test(NAME support/${_srcx}
+          COMMAND ${CMAKE_COMMAND} -DCommand=$<TARGET_FILE:${_src}>
+                                   -DInput=${src_data_file}
+                                   -DOutput=${created_data_file}
+                                   -P "${TOP_SRC_DIR}/src/support/tests/supporttest.cmake")
+
+       set_target_properties(${_src} PROPERTIES FOLDER "tests/support")
+       add_dependencies(lyx_run_tests ${_src})
 endforeach()