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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-09-30 21:26:47 +03:00
parent 77b53b0889 4554bd1743
commit bb8245d2c1
4 changed files with 45 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/CMakeLists.txt
View File

@ -48,12 +48,6 @@ add_library(maxscale-common SHARED
utils.cc
)
if(WITH_JEMALLOC)
target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})
elseif(WITH_TCMALLOC)
target_link_libraries(maxscale-common ${TCMALLOC_LIBRARIES})
endif()
target_link_libraries(maxscale-common
maxbase
${MARIADB_CONNECTOR_LIBRARIES}
@ -76,6 +70,10 @@ target_link_libraries(maxscale-common
${CURL_LIBRARIES}
)
if(WITH_ASAN AND ASAN_FOUND)
target_link_libraries(maxscale-common ${ASAN_LIBRARIES})
endif()
find_library(HAVE_LIBDL NAMES dl)
if (HAVE_LIBDL)
# libdl just exposes libc functionality on most systems. This means that if