Only create a new view for lyxfiles-open if no view is open (#12894)

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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index b42f08cf582c77a5f1b44c6cdf6448f0781e64f1..de0328ee3fded9c3918df706c76ad351b095cc90 100644 (file)
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -11,24 +11,31 @@ 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)
+       list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleSupport.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 +44,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 +56,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)
-       set(support_sources ${support_sources} ${support_mythes_sources} ${support_linkback_sources})
-       set(support_headers ${support_headers} ${support_mythes_headers} ${support_linkback_headers})
+       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,8 +76,11 @@ 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_NO_UNICODE_DEFINES TRUE)
+
+qt_use_modules(support Core Gui)
 
 target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})
 
@@ -78,6 +88,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()