Rename BUILD_AVRO to BUILD_CDC

Using the broader CDC name instead of AVRO for the CMake variable name
makes more sense as there are modules other than the avrorouter.
This commit is contained in:
Markus Mäkelä
2017-02-03 08:11:44 +02:00
parent d8e05436b1
commit a5a579ffce
7 changed files with 13 additions and 19 deletions

View File

@ -188,7 +188,7 @@ include_directories(server/modules/include)
include_directories(${CMAKE_BINARY_DIR}/include) include_directories(${CMAKE_BINARY_DIR}/include)
include_directories(${CURL_INCLUDE_DIRS}) include_directories(${CURL_INCLUDE_DIRS})
if (BUILD_AVRO) if (BUILD_CDC)
include_directories(avro) include_directories(avro)
add_subdirectory(avro) add_subdirectory(avro)
endif() endif()

View File

@ -257,7 +257,7 @@ For more information on how to use these scripts, see the output of `cdc.py -h`
To build the avrorouter from source, you will need the [Avro C](https://avro.apache.org/docs/current/api/c/) To build the avrorouter from source, you will need the [Avro C](https://avro.apache.org/docs/current/api/c/)
library, liblzma, [the Jansson library](http://www.digip.org/jansson/) and sqlite3 development headers. When library, liblzma, [the Jansson library](http://www.digip.org/jansson/) and sqlite3 development headers. When
configuring MaxScale with CMake, you will need to add `-DBUILD_AVRO=Y configuring MaxScale with CMake, you will need to add `-DBUILD_CDC=Y
-DBUILD_CDC=Y` to build the avrorouter and the CDC protocol module. -DBUILD_CDC=Y` to build the avrorouter and the CDC protocol module.
For more details about building MaxScale from source, please refer to the For more details about building MaxScale from source, please refer to the

View File

@ -22,7 +22,7 @@ set(BUILD_RABBITMQ TRUE CACHE BOOL "Build RabbitMQ components")
set(BUILD_BINLOG TRUE CACHE BOOL "Build binlog router") set(BUILD_BINLOG TRUE CACHE BOOL "Build binlog router")
# Build the Avro router # Build the Avro router
set(BUILD_AVRO TRUE CACHE BOOL "Build Avro router") set(BUILD_CDC TRUE CACHE BOOL "Build Avro router")
# Build the multimaster monitor # Build the multimaster monitor
set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor") set(BUILD_MMMON TRUE CACHE BOOL "Build multimaster monitor")

View File

@ -1,6 +1,4 @@
if(BUILD_CDC)
add_library(CDCPlainAuth SHARED cdc_plain_auth.c) add_library(CDCPlainAuth SHARED cdc_plain_auth.c)
target_link_libraries(CDCPlainAuth maxscale-common) target_link_libraries(CDCPlainAuth maxscale-common)
set_target_properties(CDCPlainAuth PROPERTIES VERSION "1.0.0") set_target_properties(CDCPlainAuth PROPERTIES VERSION "1.0.0")
install_module(CDCPlainAuth core) install_module(CDCPlainAuth core)
endif()

View File

@ -1,4 +1,7 @@
if(BUILD_CDC)
add_subdirectory(CDCPlainAuth) add_subdirectory(CDCPlainAuth)
endif()
add_subdirectory(GSSAPI) add_subdirectory(GSSAPI)
add_subdirectory(HTTPAuth) add_subdirectory(HTTPAuth)
add_subdirectory(MaxAdminAuth) add_subdirectory(MaxAdminAuth)
@ -7,10 +10,3 @@ add_subdirectory(MySQLBackendAuth)
add_subdirectory(NullAuthAllow) add_subdirectory(NullAuthAllow)
add_subdirectory(NullAuthDeny) add_subdirectory(NullAuthDeny)
# if(BUILD_TESTS)
# add_library(testprotocol SHARED testprotocol.c)
# set_target_properties(testprotocol PROPERTIES VERSION "1.0.0")
# target_link_libraries(testprotocol maxscale-common)
# install_module(testprotocol core)
# endif()

View File

@ -1,4 +1,4 @@
if(BUILD_AVRO) if(BUILD_CDC)
add_subdirectory(CDC) add_subdirectory(CDC)
add_subdirectory(examples) add_subdirectory(examples)
endif() endif()

View File

@ -1,4 +1,4 @@
if(BUILD_AVRO) if(BUILD_CDC)
add_subdirectory(avrorouter) add_subdirectory(avrorouter)
endif() endif()
if(BUILD_BINLOG) if(BUILD_BINLOG)