X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FCMakeLists.txt;h=285f35f8510360eb03fe4328f4eb2095702e6b7c;hb=351363c599db664d612fbe1b426403f91758de05;hp=cc48091732db8871c1244f5f4591b04e66dd101b;hpb=1e7e6fd8e9d18eb8a65fac5c8c85482ac30491ce;p=lyx.git

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index cc48091732..285f35f851 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -11,6 +11,7 @@ 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)
 endif()
 
 file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})
@@ -21,13 +22,16 @@ 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 "-ansi")
+
 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(APPLE)
@@ -37,6 +41,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)
 
@@ -50,8 +56,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)
@@ -71,13 +76,23 @@ 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")
+
+if(USE_MACOSX_PACKAGING AND Qt5Core_FOUND)
+       qt_use_modules(support Core Gui)
+else()
+       qt_use_modules(support Core)
+endif()
 
 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()