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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 4a018e8cce..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})
@@ -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")
@@ -41,10 +46,6 @@ else()
 	set(support_linkback_headers "")
 endif()
 
-if(UNIX AND CMAKE_COMPILER_IS_GNUCC AND NOT APPLE)
-	add_definitions(-DLYX_CALLSTACK_PRINTING)
-endif()
-
 add_subdirectory(tests)
 
 # needed to compile tex2lyx in merged mode
@@ -82,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})