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

Combine regression test suite and main CMake projects

Browse Source 
Combining the projects makes it easier to use common components. This
fixes the build failure of maxutils due to missing jansson definitions.
This commit is contained in:
Markus Mäkelä
2018-08-17 13:44:55 +03:00
parent c7a6d75ab9
commit f09afa2967
11 changed files with 29 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/CMakeLists.txt
View File

@ -61,8 +61,8 @@ elseif(WITH_TCMALLOC)
endif()
target_link_libraries(maxscale-common
maxbase
${MARIADB_CONNECTOR_LIBRARIES}
${MAXUTILS_LIBRARIES}
${LZMA_LINK_FLAGS}
${PCRE2_LIBRARIES}
${JANSSON_LIBRARIES}
@ -88,7 +88,7 @@ if (HAVE_LIBDL)
target_link_libraries(maxscale-common dl)
endif()
add_dependencies(maxscale-common pcre2 connector-c libmicrohttpd jansson maxutils)
add_dependencies(maxscale-common pcre2 connector-c libmicrohttpd jansson maxbase)
set_target_properties(maxscale-common PROPERTIES VERSION "1.0.0")
install_module(maxscale-common core)