Handle properly exception that can be thrown by to_local8bit

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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 42a9134ee3ae5bb9b8ed7530b51774cb9abdd117..06920ad0f3a866ba503cb664b44fbce096e81dad 100644 (file)
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -12,13 +12,12 @@ 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)
 
@@ -56,15 +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})
 
 
 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
@@ -77,15 +75,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")
 
-if(USE_MACOSX_PACKAGING AND Qt5Core_FOUND)
-       qt_use_modules(support Core Gui)
-else()
-       qt_use_modules(support Core)
-endif()
+qt_use_modules(support Core Gui)
 
 target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})