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

MXS-2900 Cleanup maxtest compilation

Browse Source 
The cdc-connector source does not need to be included, linking is enough.
This commit is contained in:
Esa Korhonen
2020-06-12 19:46:53 +03:00
parent 63d1f66797
commit c8700a94ab
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
maxscale-system-test/maxtest/src/CMakeLists.txt
View File

@ -22,11 +22,10 @@ add_library(maxtest SHARED
tcp_connection.cc tcp_connection.cc
test_binlog_fnc.cc test_binlog_fnc.cc
testconnections.cc testconnections.cc
${CMAKE_CURRENT_BINARY_DIR}/test_info.cc ${CMAKE_CURRENT_BINARY_DIR}/test_info.cc)
# Include the CDC connector in the core library
${CMAKE_SOURCE_DIR}/connectors/cdc-connector/cdc_connector.cpp)
target_link_libraries(maxtest ${MARIADB_CONNECTOR_LIBRARIES} ${JANSSON_LIBRARIES} maxbase maxsql z m pthread ssl dl rt crypto crypt) target_link_libraries(maxtest ${JANSSON_LIBRARIES} maxbase maxsql cdc_connector
z m pthread rt crypto crypt)
set_target_properties(maxtest PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs) set_target_properties(maxtest PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
install(TARGETS maxtest DESTINATION system-test) install(TARGETS maxtest DESTINATION system-test)
add_dependencies(maxtest connector-c jansson maxbase) add_dependencies(maxtest jansson)

2
maxutils/maxsql/src/CMakeLists.txt
View File

@ -3,6 +3,6 @@ add_library(maxsql STATIC
queryresult.cc queryresult.cc
) )
target_link_libraries(maxsql maxbase ${MARIADB_CONNECTOR_LIBRARIES}) target_link_libraries(maxsql maxbase ${MARIADB_CONNECTOR_LIBRARIES} ssl dl)
set_target_properties(maxsql PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs) set_target_properties(maxsql PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
add_dependencies(maxsql connector-c) add_dependencies(maxsql connector-c)