mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Cmake monolithic build: Some corrections.
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:
parent
3d766ad241
commit
c9f6ed309f
@ -19,10 +19,6 @@ include_directories(BEFORE
|
||||
"${TOP_SRC_DIR}/boost"
|
||||
${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})
|
||||
|
||||
target_link_libraries(${_lyxclient}
|
||||
|
@ -12,6 +12,8 @@ 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)
|
||||
else()
|
||||
list(REMOVE_ITEM support_sources "${TOP_SRC_DIR}/src/support/AppleScriptProxy.cpp")
|
||||
endif()
|
||||
|
||||
file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})
|
||||
|
Loading…
Reference in New Issue
Block a user