diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-01-25 11:02:49 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-01-25 11:02:49 +0200 |
| commit | d43afb8828e358f9c3bb690d0fdcd88b0637f155 (patch) | |
| tree | f977f3b5fa3c938183510750aecbea31bccc67ef /CMakeLists.txt | |
| parent | d0f77b83611077344ff29db02ea5593c9da62537 (diff) | |
| parent | 02765f4c614069ece1f30976848b6299ba6f24bd (diff) | |
| download | mariadb-git-d43afb8828e358f9c3bb690d0fdcd88b0637f155.tar.gz | |
Merge MariaDB-10.0.7 revision 3961.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f4b1b1744..4b0fb88422a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,12 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.6) CMAKE_POLICY(VERSION 2.8) endif() +# explicitly set the policy to OLD +# (cannot use NEW, not everyone is on cmake-2.8.12 yet) +IF(POLICY CMP0022) + CMAKE_POLICY(SET CMP0022 OLD) +ENDIF() + MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) @@ -142,7 +148,6 @@ INCLUDE(cpack_deb) INCLUDE(character_sets) INCLUDE(cpu_info) INCLUDE(zlib) -INCLUDE(libevent) INCLUDE(ssl) INCLUDE(readline) INCLUDE(libutils) @@ -273,8 +278,6 @@ MYSQL_CHECK_ZLIB_WITH_COMPRESS() MYSQL_CHECK_SSL() # Add readline or libedit. MYSQL_CHECK_READLINE() -# Add libevent -MYSQL_CHECK_LIBEVENT() CHECK_JEMALLOC() |