From: Kornel Benko Date: Tue, 26 Jan 2010 12:40:51 +0000 (+0000) Subject: Remove moc-files from the set of source files X-Git-Tag: 2.0.0~4222 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=686cd4e3a53176cd90d24770d136870bc25b9112;p=features.git Remove moc-files from the set of source files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33228 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index d02f3158c1..65009f0d96 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -108,6 +108,7 @@ endif() # lyx's source files set(LYX_CPP_FILES *.cpp) set(LYX_HPP_FILES *.h) +set(LYX_MOC_FILES moc_*.cpp) include(LyXMacros) include(ProjectSourceGroup) diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index 6f73565bcf..ddcb5cde20 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -20,6 +20,8 @@ if (UNIX) endif() file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES}) +file(GLOB moc_files ${TOP_SRC_DIR}/src/${LYX_MOC_FILES}) +list(REMOVE_ITEM lyx_sources ${moc_files} .) file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES}) list(REMOVE_ITEM lyx_sources diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt index 553080d99b..c332b3972b 100644 --- a/development/cmake/src/frontends/qt4/CMakeLists.txt +++ b/development/cmake/src/frontends/qt4/CMakeLists.txt @@ -8,6 +8,9 @@ project(frontend_qt4) file(GLOB frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES}) +file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_MOC_FILES}) +list(REMOVE_ITEM frontends_qt4_sources ${moc_files} .) + file(GLOB frontends_qt4_headers ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES}) file(GLOB frontend_qt4_UI diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt index cb46426ee7..9b40da0c65 100644 --- a/development/cmake/src/support/CMakeLists.txt +++ b/development/cmake/src/support/CMakeLists.txt @@ -7,6 +7,9 @@ project(support) file(GLOB support_sources ${TOP_SRC_DIR}/src/support/${LYX_CPP_FILES}) +file(GLOB moc_files ${TOP_SRC_DIR}/src/support/${LYX_MOC_FILES}) +list(REMOVE_ITEM support_sources ${moc_files} .) + file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES}) file(GLOB support_mythes_sources ${TOP_SRC_DIR}/src/support/mythes/*.cxx)