Browse Source

MDEV-36506 Build fails with cmake 4.0

Update cmake_minimum_required to 2.8...3.12 in root cmake and mroonga.

This will update "Policy Version" to 3.12, which will not prevent the
build by even higher cmake versions. There is also a reason to stay on
the compatible with windows "policy version", so 3.12 is conservatively
chosen.

On the other hand, it will require at least version 2.8.
pull/3956/head
Nikita Malyavin 6 months ago
parent
commit
2a5a12b227
  1. 2
      CMakeLists.txt
  2. 2
      storage/mroonga/CMakeLists.txt
  3. 2
      storage/mroonga/vendor/groonga/CMakeLists.txt
  4. 2
      storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt

2
CMakeLists.txt

@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.12)
IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
# Setting build type to RelWithDebInfo as none was specified.

2
storage/mroonga/CMakeLists.txt

@ -17,7 +17,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8...3.12)
project(mroonga)
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

2
storage/mroonga/vendor/groonga/CMakeLists.txt

@ -15,7 +15,7 @@
# 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...
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8...3.12)
# cmake_minimum_required(VERSION 2.6.4) # CentOS 5
set(GRN_PROJECT_NAME "groonga")
set(GRN_PROJECT_LABEL "Groonga")

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

@ -15,7 +15,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1335 USA
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 2.8...3.12)
if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
endif()

Loading…
Cancel
Save