Skip to content

Commit d78a14c

Browse files
committed
cmake 3.14.3 warnings
1 parent ee8477f commit d78a14c

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ ENDIF()
2222
IF(POLICY CMP0054)
2323
CMAKE_POLICY(SET CMP0054 NEW)
2424
ENDIF()
25+
IF(POLICY CMP0075)
26+
CMAKE_POLICY(SET CMP0075 NEW)
27+
ENDIF()
2528

2629
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
2730

storage/mroonga/vendor/groonga/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ if(DEFINED GRN_EMBED)
7777
else()
7878
set(GRN_EMBED_DEFAULT OFF)
7979
endif()
80-
option(GRN_EMBED
81-
"Build as a static library to embed into an application"
82-
${GRN_EMBED_DEFAULT})
80+
set(GRN_EMBED ${GRN_EMBED_DEFAULT} CACHE BOOL
81+
"Build as a static library to embed into an application")
8382

8483
set(BIN_DIR "bin")
8584
set(SBIN_DIR "sbin")

storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
2525
else()
2626
set(GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT OFF)
2727
endif()
28-
option(GROONGA_NORMALIZER_MYSQL_EMBED
29-
"Build as a static library to embed into an application"
30-
${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT})
28+
set(GROONGA_NORMALIZER_MYSQL_EMBED ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT}
29+
CACHE BOOL "Build as a static library to embed into an application")
3130

3231
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION)
3332

storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ static __thread int tlsvar = 0;
134134
int main(void) { return tlsvar; }" HAVE_GNU_TLS)
135135

136136
## set TOKUDB_REVISION
137-
set(CMAKE_TOKUDB_REVISION 0 CACHE INTEGER "Revision of tokudb.")
137+
set(CMAKE_TOKUDB_REVISION 0 CACHE INTERNAL "Revision of tokudb.")

0 commit comments

Comments
 (0)