hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1701: Fix build instructions

Browse Source 
Corrected the documentation on building from source and fixed a missing
variable check for the luafilter.
This commit is contained in:
Markus Mäkelä
2018-03-20 14:25:51 +02:00
parent bd8b6dbc6f
commit 65033313a7
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
View File

@ -42,7 +42,7 @@ sudo apt-get install git build-essential libssl-dev ncurses-dev bison flex \
git clone https://github.com/mariadb-corporation/MaxScale git clone https://github.com/mariadb-corporation/MaxScale
mkdir build mkdir build
cd build cd build
cmake ../MaxScale -DCMAKE_INSTALL_PREFIX=/usr cmake ../MaxScale -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_CDC=N -DBUILD_MAXCTRL=N -DBUILD_LUA=N
make make
sudo make install sudo make install
sudo ./postinst sudo ./postinst
@ -96,10 +96,10 @@ The next step is to configure MariaDB MaxScale. You only need to execute the fol
command to configure the build. command to configure the build.
``` ```
cmake ../MaxScale -DBUILD_TESTS=Y cmake ../MaxScale -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_CDC=N -DBUILD_MAXCTRL=N -DBUILD_LUA=N
``` ```
This will install MariaDB MaxScale into `/usr/local/` and build the tests. The tests and This will install MariaDB MaxScale into `/usr/` and build the tests. The tests and
other parts of the installation can be controlled via CMake arguments. other parts of the installation can be controlled via CMake arguments.
Here is a small table with the names of the most common parameters and what Here is a small table with the names of the most common parameters and what

2
cmake/defaults.cmake
View File

@ -31,7 +31,7 @@ set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor")
set(BUILD_MAXCTRL TRUE CACHE BOOL "Build MaxCtrl") set(BUILD_MAXCTRL TRUE CACHE BOOL "Build MaxCtrl")
# Build Luafilter # Build Luafilter
set(BUILD_LUAFILTER FALSE CACHE BOOL "Build Luafilter") set(BUILD_LUAFILTER TRUE CACHE BOOL "Build Luafilter")
# Use gcov build flags # Use gcov build flags
set(GCOV FALSE CACHE BOOL "Use gcov build flags") set(GCOV FALSE CACHE BOOL "Use gcov build flags")

2
server/modules/filter/luafilter/CMakeLists.txt
View File

@ -1,3 +1,4 @@
if (BUILD_LUAFILTER)
find_package(Lua) find_package(Lua)
if(LUA_FOUND) if(LUA_FOUND)
include_directories(${LUA_INCLUDE_DIR}) include_directories(${LUA_INCLUDE_DIR})
@ -8,3 +9,4 @@ if(LUA_FOUND)
else() else()
message(STATUS "Lua was not found, luafilter will not be built.") message(STATUS "Lua was not found, luafilter will not be built.")
endif() endif()
endif()