Changeset: 26a8f74cfa87 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/26a8f74cfa87 Branch: Jul2021 Log Message:
merged diffs (137 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,11 +4,15 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: monetdb-mapi Description: MonetDB MAPI C-client libary URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ Requires.private: monetdb-stream = @MONETDB_VERSION@ openssl -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmapi -Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb +Libs: -L${libdir} -lmapi +Cflags: -I${includedir}/monetdb 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,12 +4,16 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: monetdb-stream Description: MonetDB streams libary URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ Requires.private: @PKG_ZLIB@ @PKG_BZIP2@ @PKG_CURL@ @PKG_LZMA@ @PKG_SNAPPY@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstream +Libs: -L${libdir} -lstream Libs.private: @SOCKET_LIBS@ @PKG_LIBICONV@ -Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb +Cflags: -I${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,12 +4,16 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: monetdb-gdk Description: MonetDB GDK libary URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ Requires.private: monetdb-stream = @MONETDB_VERSION@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lbat +Libs: -L${libdir} -lbat Libs.private: -lm @CMAKE_THREAD_LIBS_INIT@ -l@CMAKE_DL_LIBS@ -Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb +Cflags: -I${includedir}/monetdb diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt --- a/monetdb5/mal/CMakeLists.txt +++ b/monetdb5/mal/CMakeLists.txt @@ -12,10 +12,14 @@ set(mal_public_headers ${CMAKE_CURRENT_SOURCE_DIR}/mal_client.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_errors.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_exception.h + ${CMAKE_CURRENT_SOURCE_DIR}/mal_function.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_import.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_instruction.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_linker.h + ${CMAKE_CURRENT_SOURCE_DIR}/mal_listing.h + ${CMAKE_CURRENT_SOURCE_DIR}/mal_module.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_namespace.h + ${CMAKE_CURRENT_SOURCE_DIR}/mal_resolve.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_stack.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h ${CMAKE_CURRENT_SOURCE_DIR}/mal_prelude.h 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,11 +4,15 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: monetdb5 Description: MonetDB5 URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ Requires.private: monetdb-gdk = @MONETDB_VERSION@ monetdb-stream = @MONETDB_VERSION@ @PKG_LIBXML2@ @PKG_CRYPTO@ @PKG_PCRE@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmonetdb5 -Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb +Libs: -L${libdir} -lmonetdb5 +Cflags: -I${includedir}/monetdb diff --git a/sql/test/SQLancer/Tests/sqlancer15.test b/sql/test/SQLancer/Tests/sqlancer15.test --- a/sql/test/SQLancer/Tests/sqlancer15.test +++ b/sql/test/SQLancer/Tests/sqlancer15.test @@ -802,7 +802,7 @@ INSERT INTO t1(c0, c1) VALUES(-1, INTERV statement ok rowcount 3 INSERT INTO t1(c4, c1, c0) VALUES(0.34700167, INTERVAL '5' MONTH, 0), (9, INTERVAL '-4' MONTH, NULL), (-2, INTERVAL '-2' MONTH, NULL) -statement ok rowcount 16 +statement ok rowcount 17 UPDATE t1 SET c0 = 0, c1 = INTERVAL '-8' MONTH, c4 = least(t1.c4, 0) statement ok 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 @@ -4,11 +4,15 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: monetdbe Description: MonetDB as embedded library URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ Requires.private: monetdb-gdk = @MONETDB_VERSION@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lmonetdbe -Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/monetdb +Libs: -L${libdir} -lmonetdbe +Cflags: -I${includedir}/monetdb _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
