From 82db64c95894dd8cf6073f67191f2e38b4214d5e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Fri, 16 Jun 2006 16:43:17 +0000
Subject: [PATCH] use glob instead of lists

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14129 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/intl/CMakeLists.txt         |   4 +-
 development/cmake/src/CMakeLists.txt          | 246 ++----------------
 .../cmake/src/frontends/CMakeLists.txt        |  38 +--
 .../src/frontends/controllers/CMakeLists.txt  | 100 +------
 .../cmake/src/frontends/qt4/CMakeLists.txt    | 200 +-------------
 development/cmake/src/graphics/CMakeLists.txt |  30 +--
 development/cmake/src/insets/CMakeLists.txt   | 107 +-------
 development/cmake/src/mathed/CMakeLists.txt   | 161 +-----------
 development/cmake/src/support/CMakeLists.txt  |  77 +-----
 9 files changed, 54 insertions(+), 909 deletions(-)

diff --git a/development/cmake/intl/CMakeLists.txt b/development/cmake/intl/CMakeLists.txt
index cb2df377e6..4ef0f0e13d 100644
--- a/development/cmake/intl/CMakeLists.txt
+++ b/development/cmake/intl/CMakeLists.txt
@@ -36,7 +36,7 @@ else(MSVC_IDE)
 endif(MSVC_IDE)
 
     
-
+file(GLOB intl_headers ${TOP_SRC_DIR}/intl/*.h)
 
 set(intl_sources 
       bindtextdom.c
@@ -72,7 +72,7 @@ if(ICONV_FOUND)
 	include_directories(${ICONV_INCLUDE_DIR})
 endif(ICONV_FOUND)
 
-add_library(intl STATIC ${intl_sources})
+add_library(intl STATIC ${intl_sources} ${intl_headers})
 
 if(ICONV_FOUND)
 	target_link_libraries(intl ${ICONV_LIBRARY})
diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 9e49df6c1f..033b0f91ba 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -12,245 +12,29 @@ add_subdirectory(support)
 
 configure_file(version.C.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.C)
 
-set(lyx_sources
-	Bidi.C
-	Bidi.h
-	BufferView.C
-	BufferView.h
-	BufferView_pimpl.C
-	BufferView_pimpl.h
-	Bullet.C
-	Bullet.h
-	BranchList.C
-	BranchList.h
-	Chktex.C
-	Chktex.h
-	Color.C
-	Color.h
-	CutAndPaste.C
-	CutAndPaste.h
-	DepTable.C
-	DepTable.h
-	FloatList.C
-	FloatList.h
-	Floating.C
-	Floating.h
-	FontIterator.C
-	FontIterator.h
-	FuncStatus.C
-	FuncStatus.h
-	InsetList.C
-	InsetList.h
-	LColor.C
-	LColor.h
-	LaTeX.C
-	LaTeX.h
-	LaTeXFeatures.C
-	LaTeXFeatures.h
-	LyXAction.C
-	LyXAction.h
-	MenuBackend.C
-	MenuBackend.h
-	ParagraphList.h
-	ParagraphList_fwd.h
-	ParagraphParameters.C
-	ParagraphParameters.h
-	PrinterParams.C
-	PrinterParams.h
-	RowList_fwd.h
-	Spacing.C
-	Spacing.h
-	Thesaurus.C
-	Thesaurus.h
-	ToolbarBackend.C
-	ToolbarBackend.h
-	WordLangTuple.h
-	author.C
-	author.h
-	boost.C
-	box.h
-	box.C
-	buffer.C
-	buffer.h
-	buffer_funcs.C
-	buffer_funcs.h
-	bufferlist.C
-	bufferlist.h
-	bufferparams.C
-	bufferparams.h
-	bufferview_funcs.C
-	bufferview_funcs.h
-	changes.C
-	changes.h
-	chset.C
-	chset.h
-	converter.C
-	converter.h
-	counters.C
-	counters.h
-	coordcache.C
-	coordcache.h
-	cursor.C
-	cursor.h
-	cursor_slice.C
-	cursor_slice.h
-	debug.C
-	debug.h
-	dimension.C
-	dimension.h
-	dociterator.C
-	dociterator.h
-	dispatchresult.h
-	encoding.C
-	encoding.h
-	errorlist.C
-	errorlist.h
-	exporter.C
-	exporter.h
-	gettext.C
-	gettext.h
-	factory.h
-	factory.C
-	format.C
-	format.h
-	funcrequest.h
-	funcrequest.C
-	graph.C
-	graph.h
-	importer.C
-	importer.h
-	intl.C
-	intl.h
-	insetiterator.C
-	insetiterator.h
-	kbmap.C
-	kbmap.h
-	kbsequence.C
-	kbsequence.h
-	language.C
-	language.h
-	session.C
-	session.h
-	layout.h
-	lengthcommon.C
-	lengthcommon.h
-	lfuns.h
-	lyx_cb.C
-	lyx_cb.h
-	lyx_main.C
-	lyx_main.h
-	lyx_sty.C
-	lyx_sty.h
-	lyxfont.C
-	lyxfont.h
-	lyxfind.C
-	lyxfind.h
-	lyxfunc.C
-	lyxfunc.h
-	lyxgluelength.C
-	lyxgluelength.h
-	lyxlayout.C
-	lyxlayout.h
-	lyxlayout_ptr_fwd.h
-	lyxlength.C
-	lyxlength.h
-	lyxlex.C
-	lyxlex.h
-	lyxlex_pimpl.C
-	lyxlex_pimpl.h
-	lyxrc.C
-	lyxrc.h
-	lyxrow.C
-	lyxrow.h
-	lyxrow_funcs.C
-	lyxrow_funcs.h
-	lyxserver.C
-	lyxserver.h
-	lyxsocket.C
-	lyxsocket.h
-	lyxtext.h
-	lyxtextclass.C
-	lyxtextclass.h
-	lyxtextclasslist.C
-	lyxtextclasslist.h
-	lyxvc.C
-	lyxvc.h
-	main.C
-	messages.C
-	messages.h
-	metricsinfo.C
-	metricsinfo.h
-	mover.C
-	mover.h
-	output.C
-	output.h
-	outputparams.C
-	outputparams.h
-	output_docbook.C
-	output_docbook.h
-	output_latex.C
-	output_latex.h
-	output_linuxdoc.C
-	output_linuxdoc.h
-	output_plaintext.C
-	output_plaintext.h
-	paper.h
-	paragraph.C
-	paragraph.h
-	paragraph_funcs.C
-	paragraph_funcs.h
-	paragraph_pimpl.C
-	paragraph_pimpl.h
-	pariterator.C
-	pariterator.h
-	#$(PSPELL) 
-	#$(ISPELL) 
-	SpellBase.C
-	SpellBase.h
-	rowpainter.C
-	rowpainter.h
-	sgml.C
-	sgml.h
-	tabular.C
-	tabular.h
-	tex-accent.C
-	tex-accent.h
-	tex-strings.C
-	tex-strings.h
-	texrow.C
-	texrow.h
-	text.C
-	text2.C
-	text3.C
-	TocBackend.C
-	TocBackend.h
-	toc.C
-	toc.h
-	trans.C
-	trans.h
-	trans_decl.h
-	trans_mgr.C
-	trans_mgr.h
-	undo.C
-	undo.h
-	vc-backend.C
-	vc-backend.h
-	version.h
-	vspace.C
-	vspace.h
-)
+file(GLOB lyx_sources ${TOP_SRC_DIR}/src/*.C)
+file(GLOB lyx_headers ${TOP_SRC_DIR}/src/*.h)
+
+list(REMOVE_ITEM lyx_sources
+	${TOP_SRC_DIR}/src/aspell.C
+	${TOP_SRC_DIR}/src/pspell.C
+	${TOP_SRC_DIR}/src/ispell.C
+	${TOP_SRC_DIR}/src/Variables.C
+	${TOP_SRC_DIR}/src/Sectioning.C)
 
 if(ASPELL_FOUND)
 	include_directories(${ASPELL_INCLUDE_DIR})
-	set(lyx_sources ${lyx_sources} aspell.C)
+	set(lyx_sources ${lyx_sources} ${TOP_SRC_DIR}/src/aspell.C)
 endif(ASPELL_FOUND)
 
 
-lyx_add_path(lyx_sources ${TOP_SRC_DIR}/src)
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(lyx-qt4 ${lyx_sources} ${CMAKE_CURRENT_BINARY_DIR}/version.C)
+add_executable(lyx-qt4 
+	${lyx_sources} 
+	${lyx_headers}
+	${CMAKE_CURRENT_BINARY_DIR}/version.C
+	)
 
 target_link_libraries(lyx-qt4 
 	mathed
diff --git a/development/cmake/src/frontends/CMakeLists.txt b/development/cmake/src/frontends/CMakeLists.txt
index 590d3812f6..1784421b6a 100644
--- a/development/cmake/src/frontends/CMakeLists.txt
+++ b/development/cmake/src/frontends/CMakeLists.txt
@@ -5,42 +5,10 @@ include_directories(${TOP_SRC_DIR}/src/frontends)
 add_subdirectory(controllers) 
 add_subdirectory(qt4) 
 
-set(frontends_sources
-	Alert.C
-	Alert.h
-	Alert_pimpl.h
-	Dialogs.C
-	Dialogs.h
-	FileDialog.h
-	LyXKeySym.h
-	LyXKeySymFactory.h
-	LyXScreenFactory.h
-	LyXView.C
-	LyXView.h
-	Menubar.h
-	Painter.C
-	Painter.h
-	Timeout.C
-	Timeout.h
-	Toolbars.C
-	Toolbars.h
-	WorkArea.h
-	WorkAreaFactory.h
-	font_metrics.h
-	guiapi.h
-	guiapi.C
-	key_state.h
-	lyx_gui.h
-	mouse_state.h
-	nullpainter.C
-	nullpainter.h
-	screen.C
-	screen.h
-)
+file(GLOB frontends_sources ${TOP_SRC_DIR}/src/frontends/*.C)
+file(GLOB frontends_headers ${TOP_SRC_DIR}/src/frontends/*.h)
 
-lyx_add_path(frontends_sources ${TOP_SRC_DIR}/src/frontends)
-
-add_library(frontends STATIC ${frontends_sources})
+add_library(frontends STATIC ${frontends_sources} ${frontends_headers})
 
 
 
diff --git a/development/cmake/src/frontends/controllers/CMakeLists.txt b/development/cmake/src/frontends/controllers/CMakeLists.txt
index 8bd60d65a7..a092a5e8c5 100644
--- a/development/cmake/src/frontends/controllers/CMakeLists.txt
+++ b/development/cmake/src/frontends/controllers/CMakeLists.txt
@@ -1,105 +1,11 @@
 project(controllers)
 
-set(controllers_sources
-	Dialog.C
-	Dialog.h
-	Kernel.C
-	Kernel.h
-	biblio.C
-	biblio.h
-	character.C
-	character.h
-	frnt_lang.C
-	frnt_lang.h
-	tex_helpers.C
-	tex_helpers.h
-	BCView.h
-	BCView.C
-	ButtonController.C
-	ButtonController.h
-	ButtonPolicies.C
-	ButtonPolicies.h
-	ControlAboutlyx.C
-	ControlAboutlyx.h
-	ControlBibtex.C
-	ControlBibtex.h
-	ControlBox.C
-	ControlBox.h
-	ControlBranch.C
-	ControlBranch.h
-	ControlCharacter.C
-	ControlCharacter.h
-	ControlChanges.C
-	ControlChanges.h
-	ControlCitation.C
-	ControlCitation.h
-	ControlCommand.C
-	ControlCommand.h
-	ControlCommandBuffer.C
-	ControlCommandBuffer.h
-	ControlDocument.C
-	ControlDocument.h
-	ControlErrorList.C
-	ControlErrorList.h
-	ControlERT.C
-	ControlERT.h
-	ControlExternal.C
-	ControlExternal.h
-	ControlFloat.C
-	ControlFloat.h
-	ControlGraphics.C
-	ControlGraphics.h
-	ControlInclude.C
-	ControlInclude.h
-	ControlLog.C
-	ControlLog.h
-	ControlViewSource.C
-	ControlViewSource.h
-	ControlMath.C
-	ControlMath.h
-	ControlNote.C
-	ControlNote.h
-	ControlParagraph.C
-	ControlParagraph.h
-	ControlPreamble.C
-	ControlPreamble.h
-	ControlPrefs.C
-	ControlPrefs.h
-	ControlPrint.C
-	ControlPrint.h
-	ControlRef.C
-	ControlRef.h
-	ControlSearch.C
-	ControlSearch.h
-	ControlSendto.C
-	ControlSendto.h
-	ControlShowFile.C
-	ControlShowFile.h
-	ControlSpellchecker.C
-	ControlSpellchecker.h
-	ControlTabular.C
-	ControlTabular.h
-	ControlTabularCreate.C
-	ControlTabularCreate.h
-	ControlTexinfo.C
-	ControlTexinfo.h
-	ControlThesaurus.C
-	ControlThesaurus.h
-	ControlToc.C
-	ControlToc.h
-	ControlVSpace.C
-	ControlVSpace.h
-	ControlWrap.C
-	ControlWrap.h
-	helper_funcs.C
-	helper_funcs.h
-)
-
-lyx_add_path(controllers_sources ${TOP_SRC_DIR}/src/frontends/controllers)
+file(GLOB controllers_sources ${TOP_SRC_DIR}/src/frontends/controllers/*.C)
+file(GLOB controllers_headers ${TOP_SRC_DIR}/src/frontends/controllers/*.h)
 
 include_directories(${TOP_SRC_DIR}/src/frontends/controllers)
 
-add_library(controllers STATIC ${controllers_sources})
+add_library(controllers STATIC ${controllers_sources} ${controllers_headers})
 
 target_link_libraries(controllers boost_regex boost_filesystem)
 
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 12e11f910e..c526a3421e 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -1,202 +1,10 @@
 project(frontend_qt4)
 
-set(frontends_qt4_dialog_sources
-	BulletsModule.C
-	emptytable.C
-	FileDialog_private.C
-	floatplacement.C
-	iconpalette.C
-	InsertTableWidget.C
-	lengthcombo.C
-	QAboutDialog.C
-	QBibitemDialog.C
-	QBibtexDialog.C
-	QBoxDialog.C
-	QBranchDialog.C
-	QChangesDialog.C
-	QCharacterDialog.C
-	QCitationDialog.C
-	QCommandBuffer.C
-	QCommandEdit.C
-	QDelimiterDialog.C
-	QDocumentDialog.C
-	QErrorListDialog.C
-	QERTDialog.C
-	QExternalDialog.C
-	QFloatDialog.C
-	QGraphicsDialog.C
-	QIncludeDialog.C
-	QIndexDialog.C
-	QLogDialog.C
-	QViewSourceDialog.C
-	QLPopupMenu.C
-	QLPrintDialog.C
-	QMathDialog.C
-	QMathMatrixDialog.C
-	QNoteDialog.C
-	QParagraphDialog.C
-	QPrefsDialog.C
-	QRefDialog.C
-	QSearchDialog.C
-	QSendtoDialog.C
-	qsetborder.C
-	QShowFileDialog.C
-	QSpellcheckerDialog.C
-	QDialogView.C
-	QTabularCreateDialog.C
-	QTabularDialog.C
-	QTexinfoDialog.C
-	QThesaurusDialog.C
-	TocModel.C
-	QTocDialog.C
-	QtView.C
-	QURLDialog.C
-	QVSpaceDialog.C
-	QWrapDialog.C
-	QLToolbar.C
-	socket_callback.C
-	validators.C
-	#Profile.C
-)
 
-set(frontends_qt4_sources
-	Alert_pimpl.C
-	Dialogs.C
-	FileDialog.C
-	LyXKeySymFactory.C
-	LyXScreenFactory.C
-	QLMenubar.C 
-	qtTimeout.C 
-	QAbout.C 
-	QBibitem.C 
-	QBibtex.C 
-	QBox.C 
-	QBranch.C 
-	QBranches.C 
-	QChanges.C 
-	QCharacter.C 
-	QCitation.C 
-	QDocument.C 
-	QErrorList.C 
-	QERT.C 
-	QExternal.C 
-	QFloat.C 
-	QGraphics.C 
-	QInclude.C 
-	QIndex.C 
-	QLAction.C 
-	QLImage.C 
-	QLog.C 
-	QViewSource.C 
-	QLPainter.C 
-	QLyXKeySym.C 
-	QMath.C 
-	QNote.C 
-	QParagraph.C
-	QPrefs.C 
-	QPrint.C 
-	QRef.C 
-	QSearch.C 
-	QSendto.C 
-	QShowFile.C 
-	QSpellchecker.C
-	QTabular.C 
-	QTabularCreate.C 
-	QTexinfo.C 
-	QThesaurus.C 
-	QToc.C 
-	QURL.C 
-	QVSpace.C 
-	QWorkArea.C 
-	QWrap.C 
-	Qt2BC.C	
-	WorkAreaFactory.C
-	checkedwidgets.C 
-	lyx_gui.C
-	lcolorcache.C
-	panelstack.C
-	qfontexample.C
-	qfont_loader.C
-	qfont_metrics.C
-	qt_helpers.C
-	${frontends_qt4_dialog_sources}
-)	
+file(GLOB frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/*.C)
+file(GLOB frontends_qt4_headers ${TOP_SRC_DIR}/src/frontends/qt4/*.h)
+file(GLOB frontend_qt4_UI       ${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui)
 
-set(frontend_qt4_UI
-	ui/BiblioUi.ui
-	ui/BranchesUi.ui
-	ui/BulletsUi.ui
-	ui/LaTeXUi.ui
-	ui/LanguageUi.ui
-	ui/MarginsUi.ui
-	ui/MathsUi.ui
-	ui/NumberingUi.ui
-	ui/PageLayoutUi.ui
-	ui/PreambleUi.ui
-	ui/QAboutUi.ui
-	ui/QAskForTextUi.ui
-	ui/QBibitemUi.ui
-	ui/QBibtexAddUi.ui
-	ui/QBibtexUi.ui
-	ui/QBoxUi.ui
-	ui/QBranchUi.ui
-	ui/QChangesUi.ui
-	ui/QCharacterUi.ui
-	ui/QCitationFindUi.ui
-	ui/QCitationUi.ui
-	ui/QDelimiterUi.ui
-	ui/QDocumentUi.ui
-	ui/QERTUi.ui
-	ui/QErrorListUi.ui
-	ui/QExternalUi.ui
-	ui/QFloatUi.ui
-	ui/QGraphicsUi.ui
-	ui/QIncludeUi.ui
-	ui/QIndexUi.ui
-	ui/QLogUi.ui
-	ui/QMathMatrixUi.ui
-	ui/QMathUi.ui
-	ui/QNoteUi.ui
-	ui/QParagraphUi.ui
-	ui/QPrefAsciiUi.ui
-	ui/QPrefColorsUi.ui
-	ui/QPrefConvertersUi.ui
-	ui/QPrefCopiersUi.ui
-	ui/QPrefCygwinPathUi.ui
-	ui/QPrefDateUi.ui
-	ui/QPrefDisplayUi.ui
-	ui/QPrefFileformatsUi.ui
-	ui/QPrefIdentityUi.ui
-	ui/QPrefKeyboardUi.ui
-	ui/QPrefLanguageUi.ui
-	ui/QPrefLatexUi.ui
-	ui/QPrefPathsUi.ui
-	ui/QPrefPrinterUi.ui
-	ui/QPrefScreenFontsUi.ui
-	ui/QPrefSpellcheckerUi.ui
-	ui/QPrefUi.ui
-	ui/QPrefsUi.ui
-	ui/QPrintUi.ui
-	ui/QRefUi.ui
-	ui/QSearchUi.ui
-	ui/QSendtoUi.ui
-	ui/QShowFileUi.ui
-	ui/QSpellcheckerUi.ui
-	ui/QTabularCreateUi.ui
-	ui/QTabularUi.ui
-	ui/QTexinfoUi.ui
-	ui/QThesaurusUi.ui
-	ui/QTocUi.ui
-	ui/QURLUi.ui
-	ui/QVSpaceUi.ui
-	ui/QViewSourceUi.ui
-	ui/QWrapUi.ui
-	ui/TextLayoutUi.ui
-)
-
-
-lyx_add_path(frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4)
-lyx_add_path(frontend_qt4_UI ${TOP_SRC_DIR}/src/frontends/qt4)
 
 lyx_automoc(${frontends_qt4_sources})
 
@@ -208,7 +16,7 @@ include_directories(	${TOP_SRC_DIR}/src/frontends/qt4
 			${TOP_SRC_DIR}/src/frontends/controllers
 			${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(frontend_qt4 STATIC ${frontends_qt4_sources})
+add_library(frontend_qt4 STATIC ${frontends_qt4_sources} ${frontends_qt4_headers})
 
 target_link_libraries(frontend_qt4 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} controllers)
 
diff --git a/development/cmake/src/graphics/CMakeLists.txt b/development/cmake/src/graphics/CMakeLists.txt
index 19dcc5df14..044d7cb6cf 100644
--- a/development/cmake/src/graphics/CMakeLists.txt
+++ b/development/cmake/src/graphics/CMakeLists.txt
@@ -1,33 +1,9 @@
 project(graphics)
 
-set(graphics_sources
-	GraphicsCache.h
-	GraphicsCache.C
-	GraphicsCacheItem.h
-	GraphicsCacheItem.C
-	GraphicsConverter.h
-	GraphicsConverter.C
-	GraphicsImage.h
-	GraphicsImage.C
-	GraphicsLoader.h
-	GraphicsLoader.C
-	GraphicsParams.C
-	GraphicsParams.h
-	LoaderQueue.h
-	LoaderQueue.C
-	GraphicsTypes.h
-	GraphicsTypes.C
-	PreviewImage.h
-	PreviewImage.C
-	PreviewLoader.h
-	PreviewLoader.C
-	Previews.h
-	Previews.C
-)
-
-lyx_add_path(graphics_sources ${TOP_SRC_DIR}/src/graphics)
+file(GLOB graphics_sources ${TOP_SRC_DIR}/src/graphics/*.C)
+file(GLOB graphics_headers ${TOP_SRC_DIR}/src/graphics/*.h)
 
 include_directories(${TOP_SRC_DIR}/src/graphics)
 
-add_library(graphics STATIC ${graphics_sources})
+add_library(graphics STATIC ${graphics_sources} ${graphics_headers})
 
diff --git a/development/cmake/src/insets/CMakeLists.txt b/development/cmake/src/insets/CMakeLists.txt
index 75b9ab272d..072488f1ad 100644
--- a/development/cmake/src/insets/CMakeLists.txt
+++ b/development/cmake/src/insets/CMakeLists.txt
@@ -1,110 +1,11 @@
 project(insets)
 
-set(insets_sources
-	mailinset.C
-	mailinset.h
-	ExternalSupport.C
-	ExternalSupport.h
-	ExternalTemplate.C
-	ExternalTemplate.h
-	ExternalTransforms.C
-	ExternalTransforms.h
-	render_base.h
-	render_button.C
-	render_button.h
-	render_graphic.C
-	render_graphic.h
-	render_preview.C
-	render_preview.h
-	inset.C
-	inset.h
-	insetbase.h
-	insetbase.C
-	insetbibitem.C
-	insetbibitem.h
-	insetbibtex.C
-	insetbibtex.h
-	insetbox.C
-	insetbox.h
-	insetbranch.C
-	insetbranch.h
-	insetcaption.C
-	insetcaption.h
-	insetcharstyle.C
-	insetcharstyle.h
-	insetcite.C
-	insetcite.h
-	insetcollapsable.C
-	insetcollapsable.h
-	insetcommand.C
-	insetcommand.h
-	insetcommandparams.C
-	insetcommandparams.h
-	insetenv.C
-	insetenv.h
-	insetert.C
-	insetert.h
-	insetexternal.C
-	insetexternal.h
-	insetfloat.h
-	insetfloat.C
-	insetfloatlist.C
-	insetfloatlist.h
-	insetfoot.C
-	insetfoot.h
-	insetfootlike.C
-	insetfootlike.h
-	insetgraphicsParams.h
-	insetgraphicsParams.C
-	insetgraphics.C
-	insetgraphics.h
-	insethfill.C
-	insethfill.h
-	insetinclude.C
-	insetinclude.h
-	insetindex.C
-	insetindex.h
-	insetlabel.C
-	insetlabel.h
-	insetlatexaccent.C
-	insetlatexaccent.h
-	insetline.C
-	insetline.h
-	insetmarginal.h
-	insetmarginal.C
-	insetnewline.C
-	insetnewline.h
-	insetnote.C
-	insetnote.h
-	insetoptarg.C
-	insetoptarg.h
-	insetpagebreak.C
-	insetpagebreak.h
-	insetquotes.C
-	insetquotes.h
-	insetref.C
-	insetref.h
-	insetspace.C
-	insetspace.h
-	insetspecialchar.C
-	insetspecialchar.h
-	insettabular.C
-	insettabular.h
-	insettext.C
-	insettext.h
-	insettoc.C
-	insettoc.h
-	inseturl.C
-	inseturl.h
-	insetvspace.C
-	insetvspace.h
-	insetwrap.h
-	insetwrap.C 
-)	
+file(GLOB insets_sources ${TOP_SRC_DIR}/src/insets/*.C)
+file(GLOB insets_headers ${TOP_SRC_DIR}/src/insets/*.h)
 
-lyx_add_path(insets_sources ${TOP_SRC_DIR}/src/insets)
+list(REMOVE_ITEM insets_sources ${TOP_SRC_DIR}/src/insets/insettheorem.C)
 
 include_directories(${TOP_SRC_DIR}/src/insets)
 
-add_library(insets STATIC ${insets_sources})
+add_library(insets STATIC ${insets_sources} ${insets_headers})
 
diff --git a/development/cmake/src/mathed/CMakeLists.txt b/development/cmake/src/mathed/CMakeLists.txt
index fb06c6dfd8..9ca62103fd 100644
--- a/development/cmake/src/mathed/CMakeLists.txt
+++ b/development/cmake/src/mathed/CMakeLists.txt
@@ -1,162 +1,15 @@
 project(mathed)
 
-set(mathed_sources
-	textpainter.C
-	textpainter.h
-	math_amsarrayinset.C
-	math_amsarrayinset.h
-	math_arrayinset.C
-	math_arrayinset.h
-	math_atom.C
-	math_atom.h
-	math_autocorrect.C
-	math_autocorrect.h
-	math_biginset.C
-	math_biginset.h
-	math_binominset.C
-	math_binominset.h
-	math_boldsymbolinset.C
-	math_boldsymbolinset.h
-	math_boxinset.C
-	math_boxinset.h
-	math_boxedinset.C
-	math_boxedinset.h
-	math_braceinset.C
-	math_braceinset.h
-	math_casesinset.C
-	math_casesinset.h
-	math_charinset.C
-	math_charinset.h
-	math_colorinset.C
-	math_colorinset.h
-	math_commentinset.C
-	math_commentinset.h
-	math_data.C
-	math_data.h
-	math_decorationinset.C
-	math_decorationinset.h
-	math_deliminset.C
-	math_deliminset.h
-	math_dfracinset.C
-	math_dfracinset.h
-	math_diffinset.C
-	math_diffinset.h
-	math_diminset.C
-	math_diminset.h
-	math_dotsinset.C
-	math_dotsinset.h
-	math_envinset.C
-	math_envinset.h
-	math_extern.C
-	math_extern.h
-	math_exfuncinset.C
-	math_exfuncinset.h
-	math_exintinset.C
-	math_exintinset.h
-	math_factory.C
-	math_factory.h
-	math_fboxinset.C
-	math_fboxinset.h
-	math_frameboxinset.C
-	math_frameboxinset.h
-	math_fontinset.C
-	math_fontinset.h
-	math_fontoldinset.C
-	math_fontoldinset.h
-	math_fracinset.C
-	math_fracinset.h
-	math_fracbase.C
-	math_fracbase.h
-	math_gridinfo.h
-	math_gridinset.C
-	math_gridinset.h
-	math_hullinset.C
-	math_hullinset.h
-	math_inset.C
-	math_inset.h
-	math_kerninset.C
-	math_kerninset.h
-	math_lefteqninset.C
-	math_lefteqninset.h
-	math_liminset.C
-	math_liminset.h
-	math_macro.C
-	math_macro.h
-	math_macroarg.C
-	math_macroarg.h
-	math_macrotemplate.C
-	math_macrotemplate.h
-	math_macrotable.C
-	math_macrotable.h
-	math_makeboxinset.C
-	math_makeboxinset.h
-	math_mathmlstream.C
-	math_mathmlstream.h
-	math_matrixinset.C
-	math_matrixinset.h
-	math_nestinset.C
-	math_nestinset.h
-	math_numberinset.C
-	math_numberinset.h
-	math_oversetinset.C
-	math_oversetinset.h
-	math_parinset.C
-	math_parinset.h
-	math_parser.C
-	math_parser.h
-	math_phantominset.C
-	math_phantominset.h
-	math_replace.h
-	math_rootinset.C
-	math_rootinset.h
-	math_scriptinset.C
-	math_scriptinset.h
-	math_sizeinset.C
-	math_sizeinset.h
-	math_spaceinset.C
-	math_spaceinset.h
-	math_splitinset.C
-	math_splitinset.h
-	math_sqrtinset.C
-	math_sqrtinset.h
-	math_stackrelinset.C
-	math_stackrelinset.h
-	math_streamstr.C
-	math_streamstr.h
-	math_stringinset.C
-	math_stringinset.h
-	math_substackinset.C
-	math_substackinset.h
-	math_support.C
-	math_support.h
-	math_symbolinset.C
-	math_symbolinset.h
-	math_tabularinset.C
-	math_tabularinset.h
-	math_tfracinset.C
-	math_tfracinset.h
-	math_unknowninset.C
-	math_unknowninset.h
-	math_undersetinset.C
-	math_undersetinset.h
-	math_xarrowinset.C
-	math_xarrowinset.h
-	math_xymatrixinset.C
-	math_xymatrixinset.h
-	command_inset.h
-	command_inset.C
-	ref_inset.h
-	ref_inset.C
-	#formulamacro.C
-)
-#	math_mboxinset.C
-#	math_mboxinset.h
+file(GLOB mathed_sources ${TOP_SRC_DIR}/src/mathed/*.C)
+file(GLOB mathed_headers ${TOP_SRC_DIR}/src/mathed/*.h)
 
-
-lyx_add_path(mathed_sources ${TOP_SRC_DIR}/src/mathed)
+list(REMOVE_ITEM mathed_sources
+	${TOP_SRC_DIR}/src/mathed/math_xyarrowinset.C
+	${TOP_SRC_DIR}/src/mathed/math_mboxinset.C
+	${TOP_SRC_DIR}/src/mathed/formulamacro.C)
 
 include_directories(${TOP_SRC_DIR}/src/mathed)
 
-add_library(mathed STATIC ${mathed_sources})
+add_library(mathed STATIC ${mathed_sources} ${mathed_headers})
 
 
diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index 6aad4f956a..33427bf8e7 100644
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -2,74 +2,23 @@ project(support)
 
 configure_file(package.C.cmake ${CMAKE_CURRENT_BINARY_DIR}/package.C)
 
-set(support_sources
-	FileMonitor.h
-	FileMonitor.C
-	RandomAccessList.h
-	abort.C
-	chdir.C
-	convert.C
-	convert.h
-	copy.C
-	copied_ptr.h
-	cow_ptr.h
-	debugstream.h
-	environment.h
-	environment.C
-	filefilterlist.C
-	filefilterlist.h
-	filename.C
-	filename.h
-	filetools.C
-	filetools.h
-	forkedcall.C
-	forkedcall.h
-	forkedcallqueue.C
-	forkedcallqueue.h
-	forkedcontr.C
-	forkedcontr.h
-	fs_extras.C
-	fs_extras.h
-	getcwd.C
-	kill.C
-	limited_stack.h
-	lstrings.C
-	lstrings.h
-	lyxalgo.h
-	lyxlib.h
-	lyxmanip.h
-	lyxtime.C
-	lyxtime.h
-	lyxsum.C
-	mkdir.C
-	os.C
-	os.h
-	path.C
-	path.h
-	package.h
-	rename.C
-	socktools.C
-	socktools.h
-	std_istream.h
-	std_ostream.h
-	systemcall.C
-	systemcall.h
-	tempname.C
-	textutils.h
-	translator.h
-	types.h
-	userinfo.C
-	userinfo.h
-	unlink.C
-)
+file(GLOB support_sources ${TOP_SRC_DIR}/src/support/*.C)
+file(GLOB support_headers ${TOP_SRC_DIR}/src/support/*.h)
 
-
-
-lyx_add_path(support_sources ${TOP_SRC_DIR}/src/support)
+list(REMOVE_ITEM support_sources 	
+	${TOP_SRC_DIR}/src/support/os_win32.C
+	${TOP_SRC_DIR}/src/support/os_unix.C
+	${TOP_SRC_DIR}/src/support/os_cygwin.C
+	${TOP_SRC_DIR}/src/support/os_os2.C
+	${TOP_SRC_DIR}/src/support/atexit.c)
+	
 
 include_directories(${TOP_SRC_DIR}/src/support)
 
-add_library(support STATIC ${support_sources} ${CMAKE_CURRENT_BINARY_DIR}/package.C)
+add_library(support STATIC 
+	${support_sources} 
+	${support_headers} 
+	${CMAKE_CURRENT_BINARY_DIR}/package.C)
 
 target_link_libraries(support boost_signals)
 
-- 
2.39.2