Changeset: f4aea65472ce for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4aea65472ce Modified Files: clients/mapilib/monetdb-mapi.pc.in common/stream/CMakeLists.txt common/stream/monetdb-stream.pc.in gdk/monetdb-gdk.pc.in monetdb5/tools/CMakeLists.txt monetdb5/tools/monetdb5.pc.in tools/monetdbe/monetdbe.pc.in Branch: Oct2020 Log Message:
Fix pkg-config files: add URL, use .private fields. diffs (115 lines): diff --git a/clients/mapilib/monetdb-mapi.pc.in b/clients/mapilib/monetdb-mapi.pc.in --- a/clients/mapilib/monetdb-mapi.pc.in +++ b/clients/mapilib/monetdb-mapi.pc.in @@ -6,8 +6,9 @@ Name: monetdb-mapi Description: MonetDB MAPI C-client libary +URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ -Requires: monetdb-stream openssl +Requires.private: monetdb-stream = @MONETDB_VERSION@ openssl Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmapi Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt --- a/common/stream/CMakeLists.txt +++ b/common/stream/CMakeLists.txt @@ -89,15 +89,15 @@ if (NOT WIN32) endif() if(CURL_FOUND) - set(PKG_CURL "${CMAKE_SHARED_LIBRARY_PREFIX}curl") + set(PKG_CURL "libcurl") endif() if(LZ4_FOUND) - set(PKG_LZ4 "${CMAKE_SHARED_LIBRARY_PREFIX}lz4") + set(PKG_LZ4 "liblz4") endif() if(LIBLZMA_FOUND) - set(PKG_LZMA "${CMAKE_SHARED_LIBRARY_PREFIX}lzma") + set(PKG_LZMA "liblzma") endif() if(SNAPPY_FOUND) diff --git a/common/stream/monetdb-stream.pc.in b/common/stream/monetdb-stream.pc.in --- a/common/stream/monetdb-stream.pc.in +++ b/common/stream/monetdb-stream.pc.in @@ -6,8 +6,10 @@ Name: monetdb-stream Description: MonetDB streams libary +URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ -Requires: @PKG_ZLIB@ @PKG_BZIP2@ @PKG_CURL@ @PKG_LZMA@ @PKG_SNAPPY@ +Requires.private: @PKG_ZLIB@ @PKG_BZIP2@ @PKG_CURL@ @PKG_LZMA@ @PKG_SNAPPY@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstream @SOCKET_LIBS@ @PKG_LIBICONV@ +Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstream +Libs.private: @SOCKET_LIBS@ @PKG_LIBICONV@ Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb diff --git a/gdk/monetdb-gdk.pc.in b/gdk/monetdb-gdk.pc.in --- a/gdk/monetdb-gdk.pc.in +++ b/gdk/monetdb-gdk.pc.in @@ -6,8 +6,10 @@ Name: monetdb-gdk Description: MonetDB GDK libary +URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ -Requires: monetdb-stream +Requires.private: monetdb-stream = @MONETDB_VERSION@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lbat -lm @CMAKE_THREAD_LIBS_INIT@ -l@CMAKE_DL_LIBS@ +Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lbat +Libs.private: -lm @CMAKE_THREAD_LIBS_INIT@ -l@CMAKE_DL_LIBS@ Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt --- a/monetdb5/tools/CMakeLists.txt +++ b/monetdb5/tools/CMakeLists.txt @@ -39,12 +39,12 @@ if (NOT WIN32) # In OpenSSL case, we link only to the crypto library, so it will be # always one library to link to get_filename_component(CRYPTO_LIBRARIES_PATH "${CRYPTO_LIBRARIES}" DIRECTORY) - set(PKG_CRYPTO "-L${CRYPTO_LIBRARIES_PATH} -lcrypto") + set(PKG_CRYPTO "libcrypto") endif() if(PCRE_FOUND) get_filename_component(PCRE_LIBRARIES_PATH "${PCRE_LIBRARIES}" DIRECTORY) - set(PKG_PCRE "-L${PCRE_LIBRARIES_PATH} -lpcre") + set(PKG_PCRE "libpcre") endif() configure_file(monetdb5.pc.in diff --git a/monetdb5/tools/monetdb5.pc.in b/monetdb5/tools/monetdb5.pc.in --- a/monetdb5/tools/monetdb5.pc.in +++ b/monetdb5/tools/monetdb5.pc.in @@ -6,8 +6,9 @@ Name: monetdb5 Description: MonetDB5 +URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ -Requires: monetdb-gdk monetdb-stream @PKG_LIBXML2@ +Requires.private: monetdb-gdk = @MONETDB_VERSION@ monetdb-stream = @MONETDB_VERSION@ @PKG_LIBXML2@ @PKG_CRYPTO@ @PKG_PCRE@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmonetdb5 @PKG_CRYPTO@ @PKG_PCRE@ +Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmonetdb5 Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb diff --git a/tools/monetdbe/monetdbe.pc.in b/tools/monetdbe/monetdbe.pc.in --- a/tools/monetdbe/monetdbe.pc.in +++ b/tools/monetdbe/monetdbe.pc.in @@ -6,8 +6,9 @@ Name: monetdbe Description: MonetDB as embedded library +URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ -#Requires: monetdb-gdk +Requires.private: monetdb-gdk = @MONETDB_VERSION@ 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
