Cmake build: Omit also hidden header files from globbing

[lyx.git] / src / support / CMakeLists.txt

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 93387ba0e0109bad65a0a83eed98b87c95c58d22..4a018e8cce8944396d3874a07133fed8dd1133e6 100644 (file)
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -22,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 "-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(APPLE)
@@ -38,6 +41,10 @@ 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
@@ -53,8 +60,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)
@@ -76,7 +82,11 @@ else()
 endif()
 set_target_properties(support PROPERTIES FOLDER "applications/LyX")
 
-qt_use_modules(support Core)
+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})
 
@@ -84,6 +94,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()