add toFilesystemEncoding for --binary-dir argument

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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index d44921ee4f0b83c11ea73de2bf04154ed6ccc7bb..efda20541a01aa84004138cc7caac3d564930d7e 100644 (file)
--- 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})
@@ -37,6 +38,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,11 +53,10 @@ 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  OR APPLE)
+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})
        add_library(support ${library_type} ${support_sources} ${support_headers} ${dont_merge})
@@ -71,13 +73,16 @@ 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)
 
 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")
 elseif(WIN32)
        target_link_libraries(support shlwapi psapi)
 endif()