Commit d785fa8d authored by Sergei Golubchik's avatar Sergei Golubchik

cmake warnings

parent 270c2338
...@@ -27,8 +27,6 @@ IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) ...@@ -27,8 +27,6 @@ IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
"None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo") "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
ENDIF() ENDIF()
PROJECT(MySQL)
IF(POLICY CMP0022) IF(POLICY CMP0022)
CMAKE_POLICY(SET CMP0022 NEW) CMAKE_POLICY(SET CMP0022 NEW)
ENDIF() ENDIF()
...@@ -42,6 +40,8 @@ IF(POLICY CMP0075) ...@@ -42,6 +40,8 @@ IF(POLICY CMP0075)
CMAKE_POLICY(SET CMP0075 NEW) CMAKE_POLICY(SET CMP0075 NEW)
ENDIF() ENDIF()
PROJECT(MySQL)
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# https://buildbot.askmonty.org/buildbot/builders/work-amd64-valgrind/builds/5263/steps/compile/logs/stdio # https://buildbot.askmonty.org/buildbot/builders/work-amd64-valgrind/builds/5263/steps/compile/logs/stdio
# says CMake 2.6.2... We want to drop old software support... # says CMake 2.6.2... We want to drop old software support...
cmake_minimum_required(VERSION 2.6.2) cmake_minimum_required(VERSION 2.8.12)
# cmake_minimum_required(VERSION 2.6.4) # CentOS 5 # cmake_minimum_required(VERSION 2.6.4) # CentOS 5
set(GRN_PROJECT_NAME "groonga") set(GRN_PROJECT_NAME "groonga")
set(GRN_PROJECT_LABEL "Groonga") set(GRN_PROJECT_LABEL "Groonga")
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1335 USA # MA 02110-1335 USA
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8.12)
if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME) if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql") set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
endif() endif()
......
...@@ -3,6 +3,10 @@ SET(CPACK_RPM_tokudb-engine_PACKAGE_DESCRIPTION "The TokuDB storage engine is fo ...@@ -3,6 +3,10 @@ SET(CPACK_RPM_tokudb-engine_PACKAGE_DESCRIPTION "The TokuDB storage engine is fo
environments, offering increased compression and better performance based environments, offering increased compression and better performance based
on fractal indexes." PARENT_SCOPE) on fractal indexes." PARENT_SCOPE)
IF(POLICY CMP0115)
CMAKE_POLICY(SET CMP0115 OLD)
ENDIF()
SET(TOKUDB_VERSION 5.6.49-89.0) SET(TOKUDB_VERSION 5.6.49-89.0)
# PerconaFT only supports x86-64 and cmake-2.8.9+ # PerconaFT only supports x86-64 and cmake-2.8.9+
IF(WIN32) IF(WIN32)
......
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