Commit 2639e866 authored by Harris Hancock's avatar Harris Hancock

autotools: install CMake package config files

parent 07527fb5
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
/c++/build-aux/ /c++/build-aux/
/c++/capnp /c++/capnp
/c++/capnp-evolution-test /c++/capnp-evolution-test
/c++/cmake/CapnProtoConfig.cmake
/c++/pkgconfig/*.pc /c++/pkgconfig/*.pc
/c++/capnp-test /c++/capnp-test
/c++/capnpc-c++ /c++/capnpc-c++
......
...@@ -33,8 +33,6 @@ EXTRA_DIST = \ ...@@ -33,8 +33,6 @@ EXTRA_DIST = \
src/capnp/testdata/packedflat \ src/capnp/testdata/packedflat \
CMakeLists.txt \ CMakeLists.txt \
cmake/FindCapnProto.cmake \ cmake/FindCapnProto.cmake \
cmake/CapnProtoConfig.cmake.in \
cmake/CapnProtoMacros.cmake \
src/CMakeLists.txt \ src/CMakeLists.txt \
src/kj/CMakeLists.txt \ src/kj/CMakeLists.txt \
src/capnp/CMakeLists.txt src/capnp/CMakeLists.txt
...@@ -116,6 +114,9 @@ dist_includecapnp_DATA = $(public_capnpc_inputs) ...@@ -116,6 +114,9 @@ dist_includecapnp_DATA = $(public_capnpc_inputs)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(CAPNP_PKG_CONFIG_FILES) pkgconfig_DATA = $(CAPNP_PKG_CONFIG_FILES)
cmakeconfigdir = $(libdir)/cmake/CapnProto
cmakeconfig_DATA = $(CAPNP_CMAKE_CONFIG_FILES) cmake/CapnProtoMacros.cmake
noinst_HEADERS = \ noinst_HEADERS = \
src/kj/miniposix.h src/kj/miniposix.h
......
...@@ -114,7 +114,20 @@ AC_DEFUN([CAPNP_PKG_CONFIG_FILES], [ \ ...@@ -114,7 +114,20 @@ AC_DEFUN([CAPNP_PKG_CONFIG_FILES], [ \
pkgconfig/kj-http.pc \ pkgconfig/kj-http.pc \
pkgconfig/kj-test.pc \ pkgconfig/kj-test.pc \
]) ])
AC_DEFUN([CAPNP_CMAKE_CONFIG_FILES], [ \
cmake/CapnProtoConfig.cmake \
])
[CAPNP_PKG_CONFIG_FILES]="CAPNP_PKG_CONFIG_FILES" [CAPNP_PKG_CONFIG_FILES]="CAPNP_PKG_CONFIG_FILES"
[CAPNP_CMAKE_CONFIG_FILES]="CAPNP_CMAKE_CONFIG_FILES"
AC_SUBST([CAPNP_PKG_CONFIG_FILES]) AC_SUBST([CAPNP_PKG_CONFIG_FILES])
AC_CONFIG_FILES([Makefile] CAPNP_PKG_CONFIG_FILES) AC_SUBST([CAPNP_CMAKE_CONFIG_FILES])
# CapnProtoConfig.cmake.in needs these PACKAGE_* output variables.
PACKAGE_INIT="set([CAPNP_PKG_CONFIG_FILES] CAPNP_PKG_CONFIG_FILES)"
PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR="${CMAKE_CURRENT_LIST_DIR}/../../include"
AC_SUBST([PACKAGE_INIT])
AC_SUBST([PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR])
AC_CONFIG_FILES([Makefile] CAPNP_PKG_CONFIG_FILES CAPNP_CMAKE_CONFIG_FILES)
AC_OUTPUT AC_OUTPUT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment