[LyX/master] Cmake monolithic build: Some corrections.

[Kornel Benko]

commit c9f6ed309f04731128389c4db5dc50b5524fda83
Author: Kornel Benko <kor...@lyx.org>
Date:   Tue Nov 17 21:21:00 2015 +0100

    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

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index f1e51a2..fffcbf0 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -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}
diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index 0091329..d93fbe4 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -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})