diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-07-12 19:16:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-07-12 19:38:10 +0200 |
| commit | d78a14c59949a01b2f044312460cd03ae6bee9d3 (patch) | |
| tree | a61aba01c1fd7e6415cf12e35b48b091e3e4b6ba | |
| parent | ee8477f9dc586f0641f7e0f7fc4e72939cd1aec7 (diff) | |
| download | mariadb-git-d78a14c59949a01b2f044312460cd03ae6bee9d3.tar.gz | |
cmake 3.14.3 warnings
4 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ea7c1df5bd..715c5f69062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ ENDIF() IF(POLICY CMP0054) CMAKE_POLICY(SET CMP0054 NEW) ENDIF() +IF(POLICY CMP0075) + CMAKE_POLICY(SET CMP0075 NEW) +ENDIF() MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt index e1f45b7fda9..564e859d146 100644 --- a/storage/mroonga/vendor/groonga/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/CMakeLists.txt @@ -77,9 +77,8 @@ if(DEFINED GRN_EMBED) else() set(GRN_EMBED_DEFAULT OFF) endif() -option(GRN_EMBED - "Build as a static library to embed into an application" - ${GRN_EMBED_DEFAULT}) +set(GRN_EMBED ${GRN_EMBED_DEFAULT} CACHE BOOL + "Build as a static library to embed into an application") set(BIN_DIR "bin") set(SBIN_DIR "sbin") diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt index 80e531e5319..d1ca2a8a0d8 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt @@ -25,9 +25,8 @@ if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED) else() set(GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT OFF) endif() -option(GROONGA_NORMALIZER_MYSQL_EMBED - "Build as a static library to embed into an application" - ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT}) +set(GROONGA_NORMALIZER_MYSQL_EMBED ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT} + CACHE BOOL "Build as a static library to embed into an application") file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION) diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake index 2f04a33558a..eac557258ea 100644 --- a/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake +++ b/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake @@ -134,4 +134,4 @@ static __thread int tlsvar = 0; int main(void) { return tlsvar; }" HAVE_GNU_TLS) ## set TOKUDB_REVISION -set(CMAKE_TOKUDB_REVISION 0 CACHE INTEGER "Revision of tokudb.") +set(CMAKE_TOKUDB_REVISION 0 CACHE INTERNAL "Revision of tokudb.") |