X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=4ee7872d509434c2ebba912fc3e9cd7a293186a3;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=490990bcad29351b835d5f7c47b7778489f4d5c6;hpb=f96583e8d203b31ef8723ebea536682fd2b6fa52;p=lyx.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 490990bcad..4ee7872d50 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ project(${_lyx}) -include_directories(${TOP_SRC_DIR}/src ${QT_INCLUDES}) +include_directories(${TOP_SRC_DIR}/src) set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") @@ -134,7 +134,6 @@ target_link_libraries(${_lyx} frontend_qt4 graphics support - ${intl_link} ${ICONV_LIBRARY} ${QT_QTMAIN_LIBRARY} ${vld_dll}) @@ -185,4 +184,9 @@ if(LYX_BUNDLE) fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME) 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()