Changeset: 56bfb5c3fe9a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56bfb5c3fe9a
Added Files:
        tools/monetdbe/monetdbe.pc.in
Modified Files:
        MonetDB.spec
        tools/monetdbe/CMakeLists.txt
Branch: oscar
Log Message:

Pkgconfig file for monetdbe.


diffs (66 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -547,7 +547,6 @@ used from the MAL level.
 
 %files -n MonetDB5-server-devel
 %defattr(-,root,root)
-%dir %{_includedir}/monetdb
 %{_includedir}/monetdb/mal*.h
 %{_libdir}/libmonetdb5.so
 %{_libdir}/pkgconfig/monetdb5.pc
@@ -641,12 +640,14 @@ main-memory perspective with use of a fu
 automatic index management, extensibility of data types and search
 accelerators.  It also has an SQL front end.
 
-This package contains the library and include files to turn MonetDB
-into an embeddable library.
+This package contains the library and include files to create a
+program that uses MonetDB as an embeddable library.
 
 %files embedded-devel
+%defattr(-,root,root)
 %{_libdir}/libmonetdbe.so
 %{_includedir}/monetdb/monetdbe.h
+%{_libdir}/pkgconfig/monetdbe.pc
 
 %package testing
 Summary: MonetDB - Monet Database Management System
diff --git a/tools/monetdbe/CMakeLists.txt b/tools/monetdbe/CMakeLists.txt
--- a/tools/monetdbe/CMakeLists.txt
+++ b/tools/monetdbe/CMakeLists.txt
@@ -56,6 +56,16 @@ target_link_libraries(monetdbe
   $<$<NOT:$<PLATFORM_ID:Windows>>:$<$<BOOL:${LibXml2_FOUND}>:LibXml2::LibXml2>>
   Threads::Threads)
 
+if (NOT WIN32)
+  configure_file(monetdbe.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/monetdbe.pc @ONLY)
+
+  install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/monetdbe.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    COMPONENT serverdev)
+endif()
+
 install(TARGETS
   monetdbe
   EXPORT monetdbeTargets
diff --git a/tools/monetdbe/monetdbe.pc.in b/tools/monetdbe/monetdbe.pc.in
new file mode 100644
--- /dev/null
+++ b/tools/monetdbe/monetdbe.pc.in
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+
+Name: monetdbe
+Description: MonetDB as embedded library
+Version: @MONETDB_VERSION@
+#Requires: monetdb-gdk
+
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmonetdbe
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to