diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
| commit | 26c389b7b770a3699ec1fc81df7f379f6084c9e6 (patch) | |
| tree | 7f915e858b211834deeb52928dfdf5ab12b24bfe /cmake | |
| parent | b9557418ccd9f484806515fba030757274e691f2 (diff) | |
| parent | fd08f953222b854428dc259631e8fc707fe34619 (diff) | |
| download | mariadb-git-26c389b7b770a3699ec1fc81df7f379f6084c9e6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/systemd.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake index 4efee737c8e..8a5695a246c 100644 --- a/cmake/systemd.cmake +++ b/cmake/systemd.cmake @@ -26,13 +26,9 @@ MACRO(CHECK_SYSTEMD) pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon) ENDIF() IF(HAVE_DLOPEN) - SET(LIBSYSTEMD ${LIBSYSTEMD_LIBRARIES}) - #SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_CFLAGS}) - SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_LDFLAGS}") + SET(LIBSYSTEMD ${LIBSYSTEMD_LDFLAGS} ${LIBSYSTEMD_LIBRARIES}) ELSE() - SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LIBRARIES}) - #SET(CMAKE_REQUIRED_FLAGS ${LIBSYSTEMD_STATIC_CFLAGS}) - SET(MYSQLD_LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${LIBSYSTEMD_STATIC_LDFLAGS}") + SET(LIBSYSTEMD ${LIBSYSTEMD_STATIC_LDFLAGS} ${LIBSYSTEMD_STATIC_LIBRARIES}) ENDIF() ELSE() SET(LIBSYSTEMD systemd) |