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

Merge branch '2.0.1' into develop

Browse Source
This commit is contained in:
Markus Makela
2016-10-03 15:21:04 +03:00
parent b42231e5d4 fa2a667195
commit fbf5c331f1
16 changed files with 449 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -218,13 +218,12 @@ if(WITH_MAXSCALE_CNF AND (NOT TARGET_COMPONENT OR "core" STREQUAL "${TARGET_COMP
install_custom_file(server/maxscale.cnf.template ${MAXSCALE_CONFDIR} core)
endif()
# This should be moved to the qc_mysqlembedded directory
# install(PROGRAMS ${ERRMSG} DESTINATION ${MAXSCALE_VARDIR}/lib/maxscale)
install_file(${CMAKE_SOURCE_DIR}/COPYRIGHT core)
install_file(${CMAKE_SOURCE_DIR}/README core)
install_file(${CMAKE_SOURCE_DIR}/LICENSE.TXT core)
install_file(etc/lsyncd_example.conf core)
install_manual(Documentation/maxscale.1 1 core)
install_file(${CMAKE_SOURCE_DIR}/server/maxscale_binlogserver_template.cnf core)
# Install startup scripts and ldconfig files