InsetArgument: Set ResetsFontEdit to false

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

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 4a5ed6e4e19627dc7afe3cfa8543ba83d615a3d7..93387ba0e0109bad65a0a83eed98b87c95c58d22 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)
 
@@ -44,12 +47,14 @@ lyx_add_msvc_pch(support)
 
 lyx_automoc(${support_sources})
 
-include_directories(${TOP_SRC_DIR}/src/support
+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})
+       ${ZLIB_INCLUDE_DIR}
+       ${LIBINTL_INCLUDE_DIR})
 
 
 if(NOT LYX_MERGE_FILES)
@@ -69,13 +74,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()