Skip to content

Commit 85b9bb7

Browse files
committed
Bug#20422957 FIX CMAKE WARNINGS IN C/C++
CMAKE version 2.8 is deprecated so cmake generated warnings. WIth change to C++17, the minimum cmake version possible is 3.12. Change-Id: I4fb41814d4f899a5765e8a92565e693819de4271
1 parent 722375d commit 85b9bb7

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929

30-
CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
30+
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
3131

3232
CMAKE_POLICY(VERSION 3.1)
3333
cmake_policy(SET CMP0022 NEW)

cdk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030

31-
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
31+
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
3232

3333
cmake_policy(VERSION 3.0)
3434

cdk/cmake/bootstrap/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0, as
@@ -31,7 +31,7 @@
3131
# See bootstrap.cmake.
3232
#
3333

34-
cmake_minimum_required(VERSION 3.0)
34+
cmake_minimum_required(VERSION 3.12)
3535
project(Bootstrap C CXX)
3636
include(TestBigEndian)
3737
test_big_endian(big_endian)

cdk/cmake/headers/check.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
# Auto generated file for compiling public header tests
3232
#
3333

34-
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
34+
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
3535
PROJECT(Headers_check)
3636

3737
add_compile_options(/wd4251) # FIXME: DLL warning
3838
add_compile_options(/wd4521) # multiple copy ctors
3939

4040
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
41-
add_compile_options("-std=c++11")
41+
add_compile_options("-std=c++17")
4242
endif()
4343

4444
INCLUDE_DIRECTORIES(@hdr_include_dir@)

cdk/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929

30-
cmake_minimum_required(VERSION 2.8)
30+
cmake_minimum_required(VERSION 3.12)
3131
# TODO: Why it is not enough to set it in the top-level CMakeLists.txt?
3232
#cmake_policy(SET CMP0023 OLD)
3333

cdk/protocol/mysqlx/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# along with this program; if not, write to the Free Software Foundation, Inc.,
2727
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

29-
cmake_minimum_required (VERSION 2.8)
29+
cmake_minimum_required (VERSION 3.12)
3030

3131
if (WITH_TESTS)
3232

jdbc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
PROJECT(MYSQLCPPCONN)
31-
cmake_minimum_required(VERSION 3.1)
31+
cmake_minimum_required(VERSION 3.12)
3232

3333
if(POLICY CMP0003)
3434
cmake_policy(SET CMP0003 NEW)

testapp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929

30-
cmake_minimum_required(VERSION 2.8)
30+
cmake_minimum_required(VERSION 2.8.12)
3131
PROJECT(MySQL_CONCPP_TEST)
3232

3333
#

0 commit comments

Comments
 (0)