X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FCMakeLists.txt;h=3e9dac512b201d0eed9b2cc6f81eebab04ebfd70;hb=a506c6b73b81fac52e32b2ca31b9e92d67ae250a;hp=d44921ee4f0b83c11ea73de2bf04154ed6ccc7bb;hpb=6a953f81ad619c8271edf31a54da4f83747ca27d;p=lyx.git

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index d44921ee4f..3e9dac512b 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -11,24 +11,30 @@ file(GLOB moc_files ${TOP_SRC_DIR}/src/support/${LYX_MOC_FILES})
 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})
 
-file(GLOB support_mythes_sources ${TOP_SRC_DIR}/src/support/mythes/*.cxx)
-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")
@@ -37,6 +43,8 @@ else()
 	set(support_linkback_headers "")
 endif()
 
+add_subdirectory(tests)
+
 # needed to compile tex2lyx in merged mode
 set(dont_merge ${dont_merge} ${TOP_SRC_DIR}/src/support/gettext.cpp)
 
@@ -47,16 +55,14 @@ lyx_automoc(${support_sources})
 include_directories(
 	${TOP_SRC_DIR}/src/support
 	${TOP_BINARY_DIR}/src/support
-	${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  OR APPLE)
-	set(support_sources ${support_sources} ${support_mythes_sources} ${support_linkback_sources})
-	set(support_headers ${support_headers} ${support_mythes_headers} ${support_linkback_headers})
+if(NOT LYX_MERGE_FILES)
+	set(support_sources ${support_sources} ${support_linkback_sources})
+	set(support_headers ${support_headers} ${support_linkback_headers})
 	add_library(support ${library_type} ${support_sources} ${support_headers} ${dont_merge})
 else()
 	# GCC bug: gcc resolves ::bind as boost::bind
@@ -69,15 +75,21 @@ else()
 	set_source_files_properties(_allinone_touched.C
 		PROPERTIES OBJECT_DEPENDS "${depends_moc}")
 	add_library(support ${library_type} ${_allinone_files} ${support_separate}
-		${support_mythes_sources} ${support_linkback_sources} ${support_headers} ${dont_merge})
+		${support_linkback_sources} ${support_headers} ${dont_merge})
 endif()
+set_target_properties(support PROPERTIES FOLDER "applications/LyX")
+
+qt_use_modules(support Core Gui)
 
 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")
+	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()