Get rid of regex_constants::match_partial

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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 3226201b185220515e114d3b5175b1481a48fbf3..42a9134ee3ae5bb9b8ed7530b51774cb9abdd117 100644 (file)
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -22,14 +22,20 @@ file(GLOB support_mythes_headers ${TOP_SRC_DIR}/src/support/mythes/*.hxx)
 file(GLOB support_linkback_sources ${TOP_SRC_DIR}/src/support/linkback/*.m*)
 file(GLOB support_linkback_headers ${TOP_SRC_DIR}/src/support/linkback/*.h)
 
+set_source_files_properties(${support_linkback_sources} 
+       ${TOP_SRC_DIR}/src/support/AppleSpeller.m
+       ${TOP_SRC_DIR}/src/support/AppleScript.m
+               PROPERTIES COMPILE_FLAGS "-std=c99")
+
 list(REMOVE_ITEM support_sources
        ${TOP_SRC_DIR}/src/support/os_win32.cpp
        ${TOP_SRC_DIR}/src/support/os_unix.cpp
        ${TOP_SRC_DIR}/src/support/os_cygwin.cpp
        ${TOP_SRC_DIR}/src/support/os_os2.C
-       ${TOP_SRC_DIR}/src/support/atexit.c
-       ${TOP_SRC_DIR}/src/support/strerror.c
        ${TOP_SRC_DIR}/src/support/gettext.cpp)
+if(NOT STD_STRING_USES_COW)
+       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/trivstring.cpp)
+endif()
 
 if(APPLE)
        message(STATUS "Mac LinkBack support")
@@ -53,8 +59,7 @@ include_directories(
        ${TOP_SRC_DIR}/src/support/mythes
        ${QT_INCLUDES}
        ${ICONV_INCLUDE_DIR}
-       ${ZLIB_INCLUDE_DIR}
-       ${LIBINTL_INCLUDE_DIR})
+       ${ZLIB_INCLUDE_DIR})
 
 
 if(NOT LYX_MERGE_FILES)
@@ -76,12 +81,21 @@ else()
 endif()
 set_target_properties(support PROPERTIES FOLDER "applications/LyX")
 
+if(USE_MACOSX_PACKAGING AND Qt5Core_FOUND)
+       qt_use_modules(support Core Gui)
+else()
+       qt_use_modules(support Core)
+endif()
+
 target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})
 
 lyx_add_gcc_pch(support)
 
 if(APPLE)
        target_link_libraries(support "objc" "-framework AppKit" "-framework CoreFoundation")
+       if(CMAKE_COMPILER_IS_GNUCXX)
+               set_source_files_properties(${support_sources} PROPERTIES COMPILE_FLAGS "-fobjc-exceptions")
+       endif()
 elseif(WIN32)
        target_link_libraries(support shlwapi psapi)
 endif()