Mercurial > hg > MonetDB-extend
changeset 52:22b5ec33dd19
Fix cmake build for monetdbe-extend.
| author | Aris Koning <aris.koning@monetdbsolutions.com> |
|---|---|
| date | Mon, 29 Nov 2021 12:31:50 +0100 (2021-11-29) |
| parents | 6086f2212001 |
| children | 781ffab3a87a |
| files | CMakeLists.txt README.md regexp/CMakeLists.txt reverse/CMakeLists.txt reverse/README.rst |
| diffstat | 5 files changed, 3 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Aug 04 14:12:50 2021 +0200 +++ b/CMakeLists.txt Mon Nov 29 12:31:50 2021 +0100 @@ -21,8 +21,6 @@ INTERNAL "Location of custom CMake modules.") -include(monetdb-functions) - find_package(MonetDB CONFIG REQUIRED) find_package(PCRE)
--- a/README.md Wed Aug 04 14:12:50 2021 +0200 +++ b/README.md Mon Nov 29 12:31:50 2021 +0100 @@ -4,7 +4,6 @@ ``` mkdir build && cd build -cmake CMAKE_PREFIX_PATH=/tmp/monetdb/include/cmake/ -DCMAKE_BUILD_TYPE=Release ~/hg/monetdb-extend/ +cmake -DCMAKE_PREFIX_PATH=<monetdb-installation-prefix>/share/monetdb/cmake -DCMAKE_INSTALL_PREFIX=<monetdb-installation-prefix> .. cmake --build . - ```
--- a/regexp/CMakeLists.txt Wed Aug 04 14:12:50 2021 +0200 +++ b/regexp/CMakeLists.txt Mon Nov 29 12:31:50 2021 +0100 @@ -23,11 +23,6 @@ OUTPUT_NAME _regexp) -install(FILES - 81_regexp.mal - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/monetdb5/autoload) - install(TARGETS regexp RUNTIME
--- a/reverse/CMakeLists.txt Wed Aug 04 14:12:50 2021 +0200 +++ b/reverse/CMakeLists.txt Mon Nov 29 12:31:50 2021 +0100 @@ -22,11 +22,6 @@ OUTPUT_NAME _reverse) -install(FILES - 80_reverse.mal - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/monetdb5/autoload) - install(TARGETS reverse RUNTIME
--- a/reverse/README.rst Wed Aug 04 14:12:50 2021 +0200 +++ b/reverse/README.rst Mon Nov 29 12:31:50 2021 +0100 @@ -203,7 +203,7 @@ These functions must be located in a dynamically loadable module (``.so`` file on Linux, ``.dll`` on Windows), and this module must -have the name ``lib_revstr.so`` (or ``lib_revstr.dll``). The +have the name ``lib_reverse.so`` (or ``lib_reverse.dll``). The functions are only directly referenced from the ``reverse_init_funcs`` array that we have defined above, so the functions are declared as ``static`` functions. @@ -443,7 +443,7 @@ .. code-block:: sh - mserver5 --loadmodule=revstr ... + mserver5 --loadmodule=reverse ... where ``...`` represents any other arguments not covered by this tutorial.