Output a parbreak after a command.

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

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d5e5ceb7adc4374e01775ba925490c43f1356dc8..0a45ad55ba9a6d48c70b143b9c8a6a7d0464239b 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -8,24 +8,18 @@ set(check_layout_SOURCES)
 foreach(_f insets/InsetLayout.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
-       support/tests/boost.cpp support/tests/dummy_functions.cpp)
+       tests/boost.cpp tests/dummy_functions.cpp)
   list(APPEND check_layout_SOURCES "${TOP_SRC_DIR}/src/${_f}")
 endforeach()
 
-add_definitions(-DNO_LAYOUT_CSS)
+include_directories(${TOP_SRC_DIR}/src/support/tests)
+
 add_executable(check_layout ${check_layout_SOURCES})
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition")
-elseif(MSVC)
-  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
-else()
-         message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
-       endif()
+target_link_libraries(check_layout support
+  ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
+  ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
 
-       target_link_libraries(check_layout support ${intl_link}
-                       ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
-               ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
 add_dependencies(lyx_run_tests check_layout)
 set_target_properties(check_layout PROPERTIES FOLDER "tests/src")
 
@@ -36,4 +30,5 @@ foreach(bns ${layout_files})
 
   add_test(NAME "check_layout/${bns}"
     COMMAND check_layout "${TOP_SRC_DIR}/lib/layouts/${bn}")
+  settestlabel("check_layout/${bns}" "layout")
 endforeach()