anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add suffixed lyxconvert to cmake build.

Browse Source 
This should amend f93ec4a, but is not tested on apple
This commit is contained in:
Kornel Benko 2017-10-02 02:00:47 +02:00
parent 9f5f4e2aa0
commit 9da29ac788
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -384,6 +384,7 @@ if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
endif() endif()
set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}") set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
set(_tex2lyx tex2lyx${PROGRAM_SUFFIX}) set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
set(_convert lyxconvert${PROGRAM_SUFFIX})
add_custom_target(lyx_version ALL 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 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

4
development/cmake/Install.cmake
View File

@ -128,7 +128,9 @@ if(APPLE)
install(FILES "${TOP_SRC_DIR}/development/MacOSX/PkgInfo" DESTINATION "${MACOSX_BUNDLE_STARTUP_COMMAND}/Contents") install(FILES "${TOP_SRC_DIR}/development/MacOSX/PkgInfo" DESTINATION "${MACOSX_BUNDLE_STARTUP_COMMAND}/Contents")
endif() 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}") install(FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.icns" DESTINATION "${LYX_DATA_SUBDIR}")
set(program_suffix ${PROGRAM_SUFFIX}) set(program_suffix ${PROGRAM_SUFFIX})
elseif(UNIX) elseif(UNIX)

1
src/CMakeLists.txt
View File

@ -17,6 +17,7 @@ add_subdirectory(insets)
add_subdirectory(mathed) add_subdirectory(mathed)
add_subdirectory(support) add_subdirectory(support)
add_subdirectory(tex2lyx) add_subdirectory(tex2lyx)
add_subdirectory(convert)
if (UNIX) if (UNIX)
add_subdirectory(client) add_subdirectory(client)
endif() endif()

12
src/convert/CMakeLists.txt Normal file
View File

@ -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})