From 257dce79d9551377cf7df0cf32705f98330418b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sun, 7 Mar 2010 11:28:57 +0000 Subject: [PATCH] cmake: fix merge build git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33661 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/src/support/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt index 6e00386b75..bf0838dd89 100644 --- 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 -- 2.39.2