Commit 58765f0b authored by Robert Izzard's avatar Robert Izzard
Browse files

Merge branch 'master' of gitlab.surrey.ac.uk:ri0005/libcdict

parents 6d92bb0e b5d40e1e

INSTALL

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ $HOME/include/cdict and the cdict-config executable in $HOME/bin, run: 


~~~bash



meson --prefix=$HOME --libdir=lib --buildtype=release builddir

meson setup --prefix=$HOME --libdir=lib --buildtype=release builddir

cd builddir

ninja install
@@ -49,7 +49,7 @@ To install a debug version in your HOME directory, run: 


~~~bash



meson --prefix=$HOME --libdir=lib --buildtype=debug builddir

meson setup --prefix=$HOME --libdir=lib --buildtype=debug builddir

cd builddir

ninja install
@@ -60,7 +60,7 @@ in your HOME directory, run: 


~~~bash



meson --prefix=$HOME --libdir=lib --buildtype=release -Dgeneric=true builddir

meson setup --prefix=$HOME --libdir=lib --buildtype=release -Dgeneric=true builddir

cd builddir

ninja install
@@ -71,7 +71,7 @@ possible on your PC, and that installs in your HOME directory, run: 


~~~bash



meson --prefix=$HOME --libdir=lib --buildtype=release -Ddebugging_symbols=false builddir

meson setup --prefix=$HOME --libdir=lib --buildtype=release -Ddebugging_symbols=false builddir

cd builddir

ninja install
@@ -81,7 +81,7 @@ To build a version suitable for use with valgrind (this disables some gcc featur 


~~~bash



meson --prefix=$HOME --libdir=lib --buildtype=debug -Dvalgrind=TRUE builddir

meson setup --prefix=$HOME --libdir=lib --buildtype=debug -Dvalgrind=TRUE builddir

cd builddir

ninja install

README.md

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ git clone https://gitlab.surrey.ac.uk/ri0005/libcdict.git 
and then, from the *libcdict* directory, run:



~~~bash

meson --prefix=$HOME --buildtype=release builddir

meson setup --prefix=$HOME --buildtype=release builddir

cd builddir

ninja install

~~~

src/cdict_tests.c

+1 −1
Original line number Diff line number Diff line
@@ -1969,7 +1969,7 @@ static Boolean test_for_valgrind(void) 
#ifndef VALGRIND

    if(running_under_valgrind == TRUE)

    {

        printf("You are trying to run libcdict's test program through valgrind without building with valgrind support. On some architectures this will fail, so please configure libcdict with something like\n\nmeson -Dvalgrind=true builddir\n\nand rebuild.\n");

        printf("You are trying to run libcdict's test program through valgrind without building with valgrind support. On some architectures this will fail, so please configure libcdict with something like\n\nmeson setup -Dvalgrind=true builddir\n\nand rebuild.\n");

        exit(1);

    }

#endif//VALGRIND