Cmake build: Added magic library to some link commands.

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

diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index d464c2a63ea2d865615d7bd3eaa443c98e6a4ec1..ed4f9bb25d9c5aa2578372c7e3a56811b9ddd452 100644 (file)
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -13,9 +13,9 @@ 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})
+               ${ZLIB_LIBRARY} ${ICONV_LIBRARY} ${Magic_LIBRARY})
 endmacro()
 
 file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})
@@ -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 build_${_srcx}
-         COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target ${_src})
-       add_test(NAME data_${_srcx}
-         COMMAND ${_src} > "${created_data_file}")
-       add_test(NAME compare_${_srcx}
-         COMMAND ${CMAKE_COMMAND} -E compare_files "${src_data_file}" "${created_data_file}")
-       set_tests_properties(data_${_srcx} PROPERTIES DEPENDS build_${_srcx} )
-       set_tests_properties(compare_${_srcx} PROPERTIES DEPENDS data_${_srcx})
+        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()