anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake:

Browse Source 
1.) Do not include layout tests on MAC, since the
  linker-option which allows multiple definitions is
  no longer supported.
2.) Indenting made consistent
This commit is contained in:
Kornel Benko 2013-05-15 11:28:04 +02:00
parent 1f41a4fcfd
commit 6e992e3544
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -185,4 +185,9 @@ if(LYX_BUNDLE)
fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME) fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME)
endif() endif()
add_subdirectory(tests) if(NOT APPLE)
# unresoved handling for multiple definitions
# APPLE can be enabled, if the hack in src/support/tests/dummy_functions.cp
# which requires multiple definitions is resolved. (Georg)
add_subdirectory(tests)
endif()

6
src/tests/CMakeLists.txt
View File

@ -23,9 +23,9 @@ else()
message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled") message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
endif() endif()
target_link_libraries(check_layout support ${intl_link} target_link_libraries(check_layout support ${intl_link}
${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARY} ${ICONV_LIBRARY}) ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
add_dependencies(lyx_run_tests check_layout) add_dependencies(lyx_run_tests check_layout)
set_target_properties(check_layout PROPERTIES FOLDER "tests/src") set_target_properties(check_layout PROPERTIES FOLDER "tests/src")