Added CMakeLists.txt to dist targets

haydaralaidrus · Nov 23, 2022 · 3ec7c2c · 3ec7c2c
1 parent 92b5bba
commit 3ec7c2c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 # Extract version from configure.ac.
-set(VERSION_REGEX "^AC_INIT\\(libconfig,[ \t]+([0-9.]+),.*")
+set(VERSION_REGEX "^AC_INIT\\(\[libconfig\],[ \t]*\[([0-9.]+)\],.*")
 file(STRINGS "configure.ac"
   VERSION_STRING REGEX ${VERSION_REGEX})
 string(REGEX REPLACE ${VERSION_REGEX} "\\1" VERSION_STRING "${VERSION_STRING}")

diff --git a/Makefile.am b/Makefile.am
@@ -40,7 +40,8 @@ EXTRA_DIST = \
 	debian/shlibs \
 	debian/watch \
 	libconfig.spec \
-	contrib
+	contrib \
+	CMakeLists.txt
 
 dist-hook:
 	rm -rf `find $(distdir)/contrib -name .svn`

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -4,3 +4,5 @@ SUBDIRS = c
 if BUILDCXX
 SUBDIRS += c++
 endif
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/examples/c++/Makefile.am b/examples/c++/Makefile.am
@@ -13,4 +13,5 @@ LDADD = $(top_builddir)/lib/libconfig++.la
 EXTRA_DIST = \
 	example.cfg invalid.cfg \
 	*.vcproj \
-	*.vcxproj
+	*.vcxproj \
+	CMakeLists.txt
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
@@ -14,4 +14,5 @@ EXTRA_DIST = \
 	cfg_includes/*.cfg \
 	cfg_includes/cfg_subincludes/*.cfg \
 	*.vcproj \
-	*.vcxproj
+	*.vcxproj \
+	CMakeLists.txt
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -78,7 +78,8 @@ EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	libconfigcpp.cc libconfig.hh \
 	*.vcproj \
-	*.vcxproj
+	*.vcxproj \
+	CMakeLists.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -15,4 +15,5 @@ EXTRA_DIST = \
 	tests.vcproj \
 	tests.vcxproj \
 	testdata/*.cfg \
-	testdata/*.txt
+	testdata/*.txt \
+	CMakeLists.txt
diff --git a/tinytest/Makefile.am b/tinytest/Makefile.am
@@ -3,4 +3,4 @@ noinst_LIBRARIES = libtinytest.a
 
 libtinytest_a_SOURCES = tinytest.c tinytest.h
 
-EXTRA_DIST = tinytest.vcproj tinytest.vcxproj
+EXTRA_DIST = tinytest.vcproj tinytest.vcxproj CMakeLists.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ noinst_LIBRARIES = libtinytest.a

		libtinytest_a_SOURCES = tinytest.c tinytest.h

		EXTRA_DIST = tinytest.vcproj tinytest.vcxproj
		EXTRA_DIST = tinytest.vcproj tinytest.vcxproj CMakeLists.txt