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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 521a42a255..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})
@@ -22,14 +24,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")
@@ -38,6 +46,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)
 
@@ -51,8 +61,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)
@@ -72,6 +81,9 @@ else()
 	add_library(support ${library_type} ${_allinone_files} ${support_separate}
 		${support_mythes_sources} ${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})
 
@@ -79,6 +91,9 @@ 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()