diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:30 +0200 |
| commit | 1320ad5b9253256afe98e948d25ed0a423a1e6da (patch) | |
| tree | 97369f9aa107f08568e1647c3c6cbfeaabf3feea /cmake | |
| parent | 88adfd0cea34b93b50d6cc1128df45bae2124bc2 (diff) | |
| parent | ca3c8d9b58fdc267b7c4df1ce3afde5ec6599344 (diff) | |
| download | mariadb-git-1320ad5b9253256afe98e948d25ed0a423a1e6da.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLis.txt | 0 | ||||
| -rw-r--r-- | cmake/systemd.cmake | 5 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/CMakeLis.txt b/cmake/CMakeLis.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cmake/CMakeLis.txt +++ /dev/null diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake index 6986cb748ce..f7365066ef6 100644 --- a/cmake/systemd.cmake +++ b/cmake/systemd.cmake @@ -13,11 +13,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -INCLUDE(FindPkgConfig) -# http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html - MACRO(CHECK_SYSTEMD) IF(UNIX) + INCLUDE(FindPkgConfig) + # http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support") IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto") IF(PKG_CONFIG_FOUND) |