Amend 3093789e for cmake build

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

diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index d04c02f99ee3bea2cd573c5eb6fa979980a2da8b..9ba00b028ad98d747e20f21496f0592e977a094e 100644 (file)
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -14,8 +14,14 @@ macro(sources _program)
        set(${_program}_SOURCES ${_tmplist})
        add_executable(${_program} ${_tmplist})
        target_link_libraries(${_program} support
-               ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
-               ${ZLIB_LIBRARY} ${LIBINTL_LIBRARIES} ${ICONV_LIBRARY})
+               ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
+               ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
+       lyx_target_link_libraries(${_program} Magic)
+       if(CYGWIN)
+               target_link_libraries(${_program} shlwapi)
+       endif()
+       qt_use_modules(${_program} Core)
+       set_property(TARGET ${_program} PROPERTY INTERPROCEDURAL_OPTIMIZATION FALSE)
 endmacro()
 
 file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})
@@ -24,29 +30,30 @@ 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)
+set(check_PROGRAMS check_convert check_filetools check_lstrings check_trivstring)
 
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/regfiles")
 
 set(_depends)
 foreach(_src ${check_PROGRAMS})
-       sources(${_src} ${_src}.cpp dummy_functions.cpp boost.cpp)
+       sources(${_src} ${_src}.cpp dummy_functions.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_custom_command(
-               OUTPUT "${created_data_file}"
-               COMMAND ${_src} > "${created_data_file}"
-               COMMAND ${CMAKE_COMMAND} -E compare_files "${src_data_file}" "${created_data_file}"
-               DEPENDS ${_src} "${src_data_file}"
-               COMMENT "${_src} > '${created_data_file}'"
-       )
-       list(APPEND _depends "${created_data_file}")
+        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()
 
-add_custom_target(checkregfiles DEPENDS support ${_depends})