[libsigcplusplus/cmake-integration] cmake: add cmake files to dist package
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigcplusplus/cmake-integration] cmake: add cmake files to dist package
- Date: Sun, 13 Mar 2016 17:06:40 +0000 (UTC)
commit b0aee162adf2ba878ccdbb3a064539298de37cec
Author: Marcin Kolny <marcin kolny gmail com>
Date: Sun Mar 13 17:46:01 2016 +0100
cmake: add cmake files to dist package
Makefile.am | 4 ++--
cmake/Makefile.am | 17 +++++++++++++++++
configure.ac | 1 +
examples/Makefile.am | 2 ++
sigc++/Makefile.am | 2 +-
tests/Makefile.am | 2 ++
6 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1ae3b2e..e16143e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ doc_subdirs = docs
else
doc_subdirs =
endif
-SUBDIRS = sigc++ tests examples $(doc_subdirs)
+SUBDIRS = sigc++ tests examples cmake $(doc_subdirs)
sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include
nodist_sigc_config_HEADERS = sigc++config.h
@@ -35,7 +35,7 @@ dist_noinst_SCRIPTS = autogen.sh
include $(srcdir)/MSVC_Net2013/filelist.am
-dist_noinst_DATA = $(addprefix MSVC_Net2013/,$(msvc_net2013_data))
+dist_noinst_DATA = $(addprefix MSVC_Net2013/,$(msvc_net2013_data)) CMakeLists.txt sigc++config.h.cmake
cmake_uninstall.cmake.in
DISTCLEANFILES = MSVC_Net2013/sigc++config.h
diff --git a/cmake/Makefile.am b/cmake/Makefile.am
new file mode 100644
index 0000000..7cf9021
--- /dev/null
+++ b/cmake/Makefile.am
@@ -0,0 +1,17 @@
+## Copyright 2016, The libsigc++ Development Team
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+dist_noinst_DATA = sigc++-3Config.cmake.in
diff --git a/configure.ac b/configure.ac
index c6cb2c4..14e2f1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,7 @@ MM_ARG_DISABLE_DEPRECATED_API([SIGCXX])
AC_CONFIG_FILES([Makefile
${SIGCXX_MODULE_NAME}.pc:sigc++.pc.in
${SIGCXX_MODULE_NAME}-uninstalled.pc:sigc++-uninstalled.pc.in
+ cmake/Makefile
sigc++/Makefile
examples/Makefile
tests/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 121f547..3df0fd1 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -21,5 +21,7 @@ LDADD = $(top_builddir)/sigc++/libsigc-$(SIGCXX_API_VERSION).la
noinst_PROGRAMS = hello_world member_method
+dist_noinst_DATA = CMakeLists.txt
+
hello_world_SOURCES = hello_world.cc
member_method_SOURCES = member_method.cc
diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am
index 0c6b886..9de87e7 100644
--- a/sigc++/Makefile.am
+++ b/sigc++/Makefile.am
@@ -22,7 +22,7 @@ include $(srcdir)/filelist.am
# Subdirectories needed also in the build dir
build_subdirs = functors
-dist_noinst_DATA = $(sigc_m4)
+dist_noinst_DATA = $(sigc_m4) CMakeLists.txt
library_includedir = $(includedir)/$(SIGCXX_MODULE_NAME)/sigc++
nobase_library_include_HEADERS = sigc++.h $(sigc_public_h) $(sigc_built_h)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5bd81a2..f4938ec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
AM_CXXFLAGS = $(SIGC_WXXFLAGS)
LDADD = $(top_builddir)/sigc++/libsigc-$(SIGCXX_API_VERSION).la
+dist_noinst_DATA = CMakeLists.txt
+
check_PROGRAMS = \
test_accum_iter \
test_accumulated \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]