Merge: Remove tex2lyx defines to allow for newer automake

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

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index f78913752e1b17c6c760625c301e4e28684a3f53..2a8b39e44f9d59b0c07424748b75f76e21188197 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -12,18 +12,12 @@ foreach(_f insets/InsetLayout.cpp Color.cpp Counters.cpp Floating.cpp
   list(APPEND check_layout_SOURCES "${TOP_SRC_DIR}/src/${_f}")
 endforeach()
 
-add_definitions(-DNO_LAYOUT_CSS)
 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 ${QT_QTMAIN_LIBRARY} ${intl_link})
 add_dependencies(lyx_run_tests check_layout)
 set_target_properties(check_layout PROPERTIES FOLDER "tests/src")
 
@@ -34,4 +28,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()