anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake monolithic build: Some corrections.

Browse Source 
In the src/support directory do not use src/support/AppleScriptProxy.cpp if not APPLE.
In the src/client directory remove inclusion of src/TexRow.cpp
This commit is contained in:
Kornel Benko 2015-11-17 21:21:00 +01:00
parent 3d766ad241
commit c9f6ed309f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/CMakeLists.txt
View File

@ -19,10 +19,6 @@ include_directories(BEFORE
"${TOP_SRC_DIR}/boost" "${TOP_SRC_DIR}/boost"
${ZLIB_INCLUDE_DIR}) ${ZLIB_INCLUDE_DIR})
if(LYX_MERGE_FILES)
set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
endif()
add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers}) add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
target_link_libraries(${_lyxclient} target_link_libraries(${_lyxclient}

2
src/support/CMakeLists.txt
View File

@ -12,6 +12,8 @@ list(REMOVE_ITEM support_sources ${moc_files} .)
if(APPLE) if(APPLE)
list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleSpeller.m) list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleSpeller.m)
list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleScript.m) list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleScript.m)
else()
list(REMOVE_ITEM support_sources "${TOP_SRC_DIR}/src/support/AppleScriptProxy.cpp")
endif() endif()
file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES}) file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})