Fixup ee0bd36a86: only clear margins when needed

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a131c99edeecb27e3f8ecaa50f4f78b21290373..39c751f3ff285b5a8fb3d1f01fdb7fddd0ab0b5f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,9 @@ add_subdirectory(insets)
 add_subdirectory(mathed)
 add_subdirectory(support)
 add_subdirectory(tex2lyx)
+if (APPLE)
+  add_subdirectory(convert)
+endif()
 if (UNIX)
        add_subdirectory(client)
 endif()
@@ -25,8 +28,10 @@ file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES})
 file(GLOB moc_files ${TOP_SRC_DIR}/src/${LYX_MOC_FILES})
 list(REMOVE_ITEM  lyx_sources ${moc_files} .)
 file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES})
+set(lyxwrap_sources ${TOP_SRC_DIR}/src/lyxwrap.cpp)
 
 list(REMOVE_ITEM lyx_sources
+       ${TOP_SRC_DIR}/src/lyxwrap.cpp
        ${TOP_SRC_DIR}/src/Variables.cpp
        ${TOP_SRC_DIR}/src/Section.cpp
        ${TOP_SRC_DIR}/src/lyxcore.cpp
@@ -128,12 +133,25 @@ target_link_libraries(${_lyx}
        frontend_qt
        graphics
        support
+       ${MYTHESLIB_LIBRARY}
        ${ICONV_LIBRARY}
        ${LYX_QTMAIN_LIBRARY}
        ${vld_dll})
 
 qt_use_modules(${_lyx} Core Gui)
 
+if(QT_USES_X11)
+  find_package(X11 REQUIRED)
+  target_link_libraries(${_lyx} ${X11_X11_LIB}) # we need it because we use XSendEvent
+  if(HAVE_QT5_X11_EXTRAS)
+    find_library(XCB_LIBRARY NAMES xcb)
+    if (XCB_LIBRARY MATCHES "NOTFOUND")
+      message(FATAL_ERROR "Need xcb library to use with QT5_X11_EXTRAS")
+    endif()
+    target_link_libraries(${_lyx} ${LYX_QT5_X11_EXTRAS_LIBRARY} ${XCB_LIBRARY})
+  endif()
+endif()
+
 lyx_target_link_libraries(${_lyx} HUNSPELL ASPELL ENCHANT Magic)
 
 if(APPLE)
@@ -155,7 +173,7 @@ endif()
 
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
-install(TARGETS ${_lyx} 
+install(TARGETS ${_lyx}
     BUNDLE DESTINATION . COMPONENT Runtime
     RUNTIME DESTINATION ${LYX_UTILITIES_INSTALL_PATH} COMPONENT Runtime)
 
@@ -177,4 +195,15 @@ if(LYX_BUNDLE)
        endif()
 endif()
 
+set(dowrapper ON) # create and install wrapper for external commands
+foreach(_f ${lyxwrap_sources})
+  if(NOT EXISTS "${_f}")
+    set(dowrapper OFF)
+  endif()
+endforeach()
+if(dowrapper AND USE_POSIX_PACKAGING)
+  add_executable(lyxwrap${PROGRAM_SUFFIX} ${lyxwrap_sources})
+  install(TARGETS lyxwrap${PROGRAM_SUFFIX} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})
+endif()
+
 add_subdirectory(tests)