Add suffixed lyxconvert to cmake build.

This should amend f93ec4a, but is not tested on apple

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 369728b6fd60e87ae8e0b79f64ceb19ffbb458cd..56fc91a9abd4deb8dddf014edcaa95801db6c9d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,6 +384,7 @@ if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
 endif()
 set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
 set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
+set(_convert lyxconvert${PROGRAM_SUFFIX})
 
 add_custom_target(lyx_version ALL
   COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_CMAKE_PATH=${TOP_CMAKE_PATH} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SCRIPT_PATH}/LyXGetVersion.cmake

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index b2e312dee27baa1107aa9c8d51ed40483b62e16a..59893449fe5e62e49d5a897ea1fb124e32eafb6c 100755 (executable)
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -128,7 +128,9 @@ if(APPLE)
     install(FILES "${TOP_SRC_DIR}/development/MacOSX/PkgInfo" DESTINATION "${MACOSX_BUNDLE_STARTUP_COMMAND}/Contents")
   endif()
 
-  install(FILES "${TOP_SRC_DIR}/development/MacOSX/lyxeditor" DESTINATION "${LYX_UTILITIES_INSTALL_PATH}")
+  foreach(_i lyxeditor maxima inkscape)
+    install(FILES "${TOP_SRC_DIR}/development/MacOSX/${_i}" DESTINATION "${LYX_UTILITIES_INSTALL_PATH}")
+  endforeach()
   install(FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.icns" DESTINATION "${LYX_DATA_SUBDIR}")
   set(program_suffix ${PROGRAM_SUFFIX})
 elseif(UNIX)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d81639bb33f76986d29877222427b5e660c47063..dc21812c128d984bc8cc5ab61abf6fd82664da7f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,7 @@ add_subdirectory(insets)
 add_subdirectory(mathed)
 add_subdirectory(support)
 add_subdirectory(tex2lyx)
+add_subdirectory(convert)
 if (UNIX)
        add_subdirectory(client)
 endif()

diff --git a/src/convert/CMakeLists.txt b/src/convert/CMakeLists.txt
new file mode 100644 (file)
index 0000000..251990d
--- /dev/null
+++ b/src/convert/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(${_convert})
+
+include_directories(${QT_INCLUDES})
+add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_STL)
+add_executable(${_convert} "${TOP_SRC_DIR}/src/convert/lyxconvert.cpp")
+
+qt_use_modules(${_convert} Core Widgets)
+if(APPLE)
+  target_link_libraries(${_convert} "-framework AppKit")
+endif()
+
+install(TARGETS ${_convert} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})