cmake: fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33661 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index 6e00386b759569602d6d4abebe71636a0baf76a2..bf0838dd89f982c54ddd0a40e2513782c4fc24b5 100644 (file)
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -55,8 +55,8 @@ if(NOT MERGE_FILES)
        add_library(support ${library_type} ${support_sources} ${support_headers} ${dont_merge})
 else()
        # GCC bug: gcc resolves ::bind as boost::bind
-       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/socktools.cpp)
-       set(support_separate ${TOP_SRC_DIR}/src/support/socktools.cpp)
+       set(support_separate ${TOP_SRC_DIR}/src/support/socktools.cpp ${TOP_SRC_DIR}/src/support/Messages.cpp)
+       list(REMOVE_ITEM support_sources ${support_separate})
        lyx_const_touched_files(_allinone  support_sources)
        set(depends_moc ${support_headers})
        set_source_files_properties(_allinone_const.C