Commit d78a14c5 authored by Sergei Golubchik's avatar Sergei Golubchik

cmake 3.14.3 warnings

parent ee8477f9
...@@ -22,6 +22,9 @@ ENDIF() ...@@ -22,6 +22,9 @@ ENDIF()
IF(POLICY CMP0054) IF(POLICY CMP0054)
CMAKE_POLICY(SET CMP0054 NEW) CMAKE_POLICY(SET CMP0054 NEW)
ENDIF() ENDIF()
IF(POLICY CMP0075)
CMAKE_POLICY(SET CMP0075 NEW)
ENDIF()
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
......
...@@ -77,9 +77,8 @@ if(DEFINED GRN_EMBED) ...@@ -77,9 +77,8 @@ if(DEFINED GRN_EMBED)
else() else()
set(GRN_EMBED_DEFAULT OFF) set(GRN_EMBED_DEFAULT OFF)
endif() endif()
option(GRN_EMBED set(GRN_EMBED ${GRN_EMBED_DEFAULT} CACHE BOOL
"Build as a static library to embed into an application" "Build as a static library to embed into an application")
${GRN_EMBED_DEFAULT})
set(BIN_DIR "bin") set(BIN_DIR "bin")
set(SBIN_DIR "sbin") set(SBIN_DIR "sbin")
......
...@@ -25,9 +25,8 @@ if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED) ...@@ -25,9 +25,8 @@ if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
else() else()
set(GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT OFF) set(GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT OFF)
endif() endif()
option(GROONGA_NORMALIZER_MYSQL_EMBED set(GROONGA_NORMALIZER_MYSQL_EMBED ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT}
"Build as a static library to embed into an application" CACHE BOOL "Build as a static library to embed into an application")
${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT})
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION) file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION)
......
...@@ -134,4 +134,4 @@ static __thread int tlsvar = 0; ...@@ -134,4 +134,4 @@ static __thread int tlsvar = 0;
int main(void) { return tlsvar; }" HAVE_GNU_TLS) int main(void) { return tlsvar; }" HAVE_GNU_TLS)
## set TOKUDB_REVISION ## set TOKUDB_REVISION
set(CMAKE_TOKUDB_REVISION 0 CACHE INTEGER "Revision of tokudb.") set(CMAKE_TOKUDB_REVISION 0 CACHE INTERNAL "Revision of tokudb.")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment