Changeset: 44c0c6c89201 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44c0c6c89201
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
Branch: default
Log Message:
improve generating pkgconfig files
diffs (121 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
@@ -4,15 +4,10 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${exec_prefix}
-libdir=${libdir}
-includedir=${includedir}
-
Name: monetdb-mapi
Description: MonetDB MAPI C-client libary
Version: @MONETDB_VERSION@
Requires: monetdb-stream openssl
-Libs: -L${libdir} -lmapi
-Cflags: -I${includedir}/monetdb
+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
@@ -79,7 +79,7 @@ if (NOT WIN32)
set(PKG_SNAPPY "snappy")
endif()
- if(ICONV_FOUND AND NOT ICONV_IS_BUILT_IN)
+ if(ICONV_FOUND AND NOT Iconv_IS_BUILT_IN)
get_filename_component(ICONV_LIBRARIES_PATH
"${ICONV_LIBRARIES}"
DIRECTORY)
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
@@ -4,15 +4,10 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${exec_prefix}
-libdir=${libdir}
-includedir=${includedir}
-
Name: monetdb-stream
Description: MonetDB streams libary
Version: @MONETDB_VERSION@
Requires: @PKG_ZLIB@ @PKG_BZIP2@ @PKG_CURL@ @PKG_LZMA@ @PKG_SNAPPY@
-Libs: -L${libdir} -lstream @PKG_LIBICONV@
-Cflags: -I${includedir}/monetdb
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstream @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
@@ -4,15 +4,10 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${exec_prefix}
-libdir=${libdir}
-includedir=${includedir}
-
Name: monetdb-gdk
Description: MonetDB GDK libary
Version: @MONETDB_VERSION@
Requires: monetdb-stream
-Libs: -L${libdir} -lbat -lm @CMAKE_THREAD_LIBS_INIT@ @CMAKE_DL_LIBS@
-Cflags: -I${includedir}/monetdb
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lbat -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
@@ -32,17 +32,18 @@ set_target_properties(monetdb5
SOVERSION ${MONETDB5_VERSION_MAJOR})
if (NOT WIN32)
- if(XML2_FOUND)
+ if(LibXml2_FOUND)
set(PKG_LIBXML2 "libxml-2.0")
endif()
if(OPENSSL_FOUND)
- # In OpenSSL case, we link only to the crypto library, so it will be
always one library to link to
+ # 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")
endif()
- if(HAVE_LIBPCRE)
+ if(PCRE_FOUND)
get_filename_component(PCRE_LIBRARIES_PATH "${PCRE_LIBRARIES}" DIRECTORY)
set(PKG_PCRE "-L${PCRE_LIBRARIES_PATH} -lpcre")
endif()
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
@@ -4,15 +4,10 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${exec_prefix}
-libdir=${libdir}
-includedir=${includedir}
-
Name: monetdb5
Description: MonetDB5
Version: @MONETDB_VERSION@
Requires: monetdb-gdk monetdb-stream @PKG_LIBXML2@
-Libs: -L${libdir} -lmonetdb5 @PKG_CRYPTO@ @PKG_PCRE@
-Cflags: -I${includedir}/monetdb
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmonetdb5 @PKG_CRYPTO@ @PKG_PCRE@
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
