The branch, master, has been updated. - Log -----------------------------------------------------------------
commit c8e325afec1a8e352ae3760acf502986fc659f07 Author: Kornel Benko <[email protected]> Date: Tue May 14 15:34:15 2013 +0200 cmake: Try to make layout-tests available for MSVC too diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 5ba9f3d..3393b18 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -14,7 +14,15 @@ endforeach() add_definitions(-DNO_LAYOUT_CSS) add_executable(check_Layout ${check_Layout_SOURCES}) -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition") + +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition") +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "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 ${QT_QTMAIN_LIBRARY}) add_dependencies(lyx_run_tests check_Layout) ----------------------------------------------------------------------- Summary of changes: src/tests/CMakeLists.txt | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
