X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FCMakeLists.txt;h=d93fbe42b154712312c767ca71019218bab34e02;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=285f35f8510360eb03fe4328f4eb2095702e6b7c;hpb=b6ccf211921e2e33114153a641f930fa050d9bee;p=lyx.git

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 285f35f851..d93fbe42b1 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -12,6 +12,8 @@ list(REMOVE_ITEM support_sources ${moc_files} .)
 if(APPLE)
 	list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleSpeller.m)
 	list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleScript.m)
+else()
+	list(REMOVE_ITEM support_sources "${TOP_SRC_DIR}/src/support/AppleScriptProxy.cpp")
 endif()
 
 file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})
@@ -25,7 +27,7 @@ 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 "-ansi")
+		PROPERTIES COMPILE_FLAGS "-std=c99")
 
 list(REMOVE_ITEM support_sources
 	${TOP_SRC_DIR}/src/support/os_win32.cpp
@@ -33,6 +35,9 @@ list(REMOVE_ITEM support_sources
 	${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")
@@ -78,11 +83,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})