Am Donnerstag, 21. August 2014 um 09:03:16, schrieb LyX Ticket Tracker <t...@lyx.org> > #9241: cmake lists are missing from the distribution > --------------------+------------------------- > Reporter: kuba | Owner: lasgouttes > Type: defect | Status: new > Priority: normal | Milestone: 2.1.x > Component: build | Version: 2.1.1 > Severity: normal | Resolution: > Keywords: | > --------------------+------------------------- > Changes (by skostysh): > > * cc: kornel (added) > > > Comment: > > Is CMake officially supported yet? Either way, we might want to add a note > to INSTALL.cmake. >
This patch should add missing cmake files. There are also some files which I
thought
are missing in autoconf dist too.
OK to commit to trunk?
Korneldiff --git a/Makefile.am b/Makefile.am
index ec8bbaa..ceb8d96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ SUBDIRS = config development po $(BOOST) src sourcedoc lib \
EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
README.Win32 README.Cygwin README.localization lyx.1in \
- autogen.sh
+ autogen.sh CMakeLists.txt po/CMakeLists.txt
man_MANS = lyx.1
diff --git a/boost/Makefile.am b/boost/Makefile.am
index d5ec00d..4e52873 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -7,7 +7,15 @@ noinst_LIBRARIES = liblyxboost.a
#BUILT_SOURCES = $(PCH_FILE)
#AM_CPPFLAGS += $(PCH_FLAGS)
-EXTRA_DIST = boost
+EXTRA_DIST = boost \
+ CMakeLists.txt \
+ libs/CMakeLists.txt \
+ libs/regex/CMakeLists.txt \
+ libs/regex/regex.vcproj \
+ libs/regex/src/CMakeLists.txt \
+ libs/signals/CMakeLists.txt \
+ libs/signals/signals.vcproj \
+ libs/signals/src/CMakeLists.txt
AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>"
AM_CPPFLAGS += $(BOOST_INCLUDES)
diff --git a/development/Makefile.am b/development/Makefile.am
index ce53bab..db5de46 100644
--- a/development/Makefile.am
+++ b/development/Makefile.am
@@ -38,6 +38,7 @@ Win32/packaging/installer/gui/external.nsh \
Win32/packaging/installer/gui/io_latex.ini \
Win32/packaging/installer/gui/LaTeXFolder.nsh \
Win32/packaging/installer/include/declarations.nsh \
+Win32/packaging/installer/include/declarations.nsh.cmake \
Win32/packaging/installer/include/detection.nsh \
Win32/packaging/installer/include/dictionaries.nsh \
Win32/packaging/installer/include/filelist.nsh \
@@ -90,6 +91,7 @@ Win32/vld/cmake/vld.cmake \
autotests/CMakeLists.txt \
autotests/check_load.cmake \
autotests/export.cmake \
+autotests/ExportTests.cmake \
autotests/keytest.py \
autotests/lyx2lyxtest.cmake \
autotests/single-test.cmake \
@@ -100,6 +102,9 @@ checkurls/search_url.pl \
cmake/ConfigureChecks.cmake \
cmake/Install.cmake \
cmake/LyxPackaging.cmake \
+cmake/LyX_description.txt \
+cmake/LyX_license.txt \
+cmake/LyX_summary.txt \
cmake/PyCompile.cmake \
cmake/config.cpp.cmake \
cmake/config.h.cmake \
@@ -110,10 +115,12 @@ cmake/doc/CMakeLists.txt \
cmake/doc/ReplaceValues.pl \
cmake/doc/ReplaceValues.py \
cmake/lyx_date.h.cmake \
+cmake/lyx.rc \
cmake/man/CMakeLists.txt \
cmake/modules/FindASPELL.cmake \
cmake/modules/FindAiksaurusLIB.cmake \
cmake/modules/FindEnchant.cmake \
+cmake/modules/FindCXX11Compiler.cmake \
cmake/modules/FindGNUWIN32.cmake \
cmake/modules/FindHunspell.cmake \
cmake/modules/FindICONV.cmake \
@@ -129,9 +136,11 @@ cmake/modules/LyXuic.cmake \
cmake/modules/MacroBoolTo01.cmake \
cmake/modules/PCHSupport_26.cmake \
cmake/modules/ProjectSourceGroup.cmake \
+cmake/pcheaders.h \
cmake/po/cat.py \
cmake/po/dos2unix.py \
cmake/po/unix2dos.py \
+cmake/post_install/CMakeLists.txt \
cmake/scripts/LyXCreateImagesResource.cmake \
cmake/scripts/LyXGetVersion.cmake \
keystest/cache-bisect.py \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fa78915..3ef328a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = doc lyx2lyx
CHMOD = chmod
+EXTRA_DIST = examples/CMakeLists.txt scripts/CMakeLists.txt
+
dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
encodings layouttranslations languages latexfonts symbols syntax.default \
unicodesymbols
@@ -337,6 +339,7 @@ dist_examples_DATA = \
examples/sweave.lyx \
examples/tufte-book.lyx \
examples/tufte-handout.lyx \
+ examples/xyfigure.lyx \
examples/xyfigure.png \
examples/xypic.lyx
@@ -1630,6 +1633,7 @@ dist_imagesoxygen_DATA = \
images/oxygen/font-emph.png \
images/oxygen/font-noun.png \
images/oxygen/footnote-insert.png \
+ images/oxygen/iconsize.png \
images/oxygen/href-insert.png \
images/oxygen/index-insert.png \
images/oxygen/label-insert.png \
@@ -2133,6 +2137,7 @@ dist_templates_DATA = \
templates/aastex.lyx \
templates/ACM-siggraph.lyx \
templates/ACM-sigplan.lyx \
+ templates/ACM-SIGS.lyx \
templates/AEA.lyx \
templates/AGUTeX.lyx \
templates/APA.lyx \
@@ -2144,6 +2149,7 @@ dist_templates_DATA = \
templates/DocBook_article.lyx \
templates/ectaart.lyx \
templates/elsarticle.lyx \
+ templates/EPS-cropped.lyx \
templates/es_beamer-conference-ornate-20min.lyx \
templates/fr_beamer-conference-ornate-20min.lyx \
templates/frletter.lyx \
@@ -2164,6 +2170,7 @@ dist_templates_DATA = \
templates/koma-letter2.lyx \
templates/letter.lyx \
templates/lettre.lyx \
+ templates/PDF-cropped.lyx \
templates/poster-a0poster-colored.lyx \
templates/poster-a0poster-simple.lyx \
templates/poster-beamerposter.lyx \
diff --git a/lib/lyx2lyx/Makefile.am b/lib/lyx2lyx/Makefile.am
index 4bc7641..ace1d72 100644
--- a/lib/lyx2lyx/Makefile.am
+++ b/lib/lyx2lyx/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
CLEANFILES += *.pyc *.pyo
-EXTRA_DIST = lyx2lyx_version.py.in test_parser_tools.py
+EXTRA_DIST = lyx2lyx_version.py.in test_parser_tools.py CMakeLists.txt
CHMOD = chmod
diff --git a/sourcedoc/Makefile.am b/sourcedoc/Makefile.am
index c446d5c..9b69fa6 100644
--- a/sourcedoc/Makefile.am
+++ b/sourcedoc/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/common.am
-EXTRA_DIST = Doxyfile.in
+EXTRA_DIST = Doxyfile.in CMakeLists.txt
OUTPUT_DIR = .
diff --git a/src/Makefile.am b/src/Makefile.am
index 17bad02..dccf8d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,12 @@ endif
SUBDIRS = support frontends . $(CLIENT) tex2lyx
-EXTRA_DIST = pch.h
+EXTRA_DIST = pch.h \
+ CMakeLists.txt \
+ graphics/CMakeLists.txt \
+ insets/CMakeLists.txt \
+ mathed/CMakeLists.txt \
+ tests/CMakeLists.txt
OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
@LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
@@ -668,7 +673,7 @@ endif
############################## Tests ##################################
EXTRA_DIST += \
- tests/test_layout
+ tests/test_layout CMakeLists.txt
alltests: check alltests-recursive
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 3251ac1..d652f0f 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -6,7 +6,7 @@ man_MANS = lyxclient.1
bin_PROGRAMS = lyxclient
-EXTRA_DIST = lyxclient.1in
+EXTRA_DIST = lyxclient.1in CMakeLists.txt
AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index ea0f097..aa74e57 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -27,6 +27,9 @@ liblyxfrontends_a_SOURCES = \
################################# Tests ################################
EXTRA_DIST = \
+ CMakeLists.txt \
+ tests/CMakeLists.txt \
+ tests/test_biblio.cmake \
tests/test_biblio \
tests/regfiles/biblio
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5270ba4..b9dc70f 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -206,6 +206,7 @@ MOCHEADER = \
GuiERT.h \
GuiExternal.h \
GuiGraphics.h \
+ GuiGraphicsUi.h \
GuiHSpace.h \
GuiHyperlink.h \
GuiInclude.h \
@@ -378,7 +379,7 @@ liblyxqt4_a_SOURCES = \
$(MOCHEADER) \
$(NOMOCHEADER)
-EXTRA_DIST = pch.h $(UIFILES:%=ui/%)
+EXTRA_DIST = pch.h CMakeLists.txt $(UIFILES:%=ui/%)
BUILT_SOURCES += $(PCH_FILE)
AM_CPPFLAGS += $(PCH_FLAGS)
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 52e31aa..ac43818 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/config/common.am
CLEANFILES += $(BUILT_SOURCES)
EXTRA_DIST = pch.h \
- os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
+ os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+ CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
noinst_LIBRARIES = liblyxsupport.a
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index fe36218..d1e4ffe 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/config/common.am
-EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h \
+ CMakeLists.txt test/CMakeLists.txt
#noinst_LIBRARIES = libtexparser.a
#
@@ -20,7 +21,9 @@ AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
-I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
TEST_FILES = \
+ test/runtests.cmake \
test/runtests.py \
+ test/algo2e.tex \
test/box-color-size-space-align.tex \
test/CJK.tex \
test/CJKutf8.tex \
@@ -40,6 +43,7 @@ TEST_FILES = \
test/xfigtest.pstex_t
TEST_RESULTS = \
+ test/algo2e.lyx.lyx \
test/box-color-size-space-align.lyx.lyx \
test/CJK.lyx.lyx \
test/CJKutf8.lyx.lyx \
signature.asc
Description: This is a digitally signed message part.
