]> git.lyx.org Git - lyx.git/blobdiff - src/support/CMakeLists.txt
Fix bugs #6078 and #9364
[lyx.git] / src / support / CMakeLists.txt
index b0916b51f917b3589b6ab0ded9c37a56e70d3211..009132961172349b832fa15a0a35ee924c977b87 100644 (file)
@@ -22,13 +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_sources} ${support_mythes_sources} PROPERTIES COMPILE_FLAGS "${LYX_CXX_SPECIFIC_FLAGS}")
+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/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")
@@ -74,11 +81,7 @@ 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()
+qt_use_modules(support Core Gui)
 
 target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})