Bump cmake version to 3.13 (#2258)

openvinotoolkit · Sep 18, 2020 · fe99e05 · fe99e05
1 parent 2026627
commit fe99e05
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 60 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,17 +8,7 @@ cmake_policy(SET CMP0054 NEW)
 # it allows to install targets created outside of current projects
 # See https://blog.kitware.com/cmake-3-13-0-available-for-download/
 
-if (APPLE)
-    if(CMAKE_GENERATOR STREQUAL "Xcode")
-        # due to https://gitlab.kitware.com/cmake/cmake/issues/14254
-        cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-    else()
-        # due to https://cmake.org/cmake/help/v3.12/policy/CMP0068.html
-        cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-    endif()
-else()
-    cmake_minimum_required(VERSION 3.7.2 FATAL_ERROR)
-endif()
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 project(OpenVINO)
 

diff --git a/docs/template_plugin/CMakeLists.txt b/docs/template_plugin/CMakeLists.txt
@@ -3,12 +3,7 @@
 #
 
 # [cmake:main]
-if (APPLE)
-    # due to https://cmake.org/cmake/help/v3.12/policy/CMP0068.html
-    cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-else()
-    cmake_minimum_required(VERSION 3.7.2 FATAL_ERROR)
-endif()
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 project(InferenceEngineTemplatePlugin)
 

diff --git a/inference-engine/cmake/models.cmake b/inference-engine/cmake/models.cmake
@@ -2,12 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(ENABLE_DOCKER)
-    cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-else()
-    cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
-endif()
-
 cmake_policy(SET CMP0054 NEW)
 
 find_package(Git REQUIRED)

diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Defines the CMake commands/policies
-cmake_minimum_required (VERSION 3.3)
+cmake_minimum_required (VERSION 3.13)
 
 # Set the project name
 project (ie_python_api)

diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required (VERSION 3.13)
 
 project(Samples)
 

diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
@@ -14,8 +14,6 @@
 # limitations under the License.
 # ******************************************************************************
 
-cmake_minimum_required (VERSION 3.11)
-
 # set directory where the custom finders live
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 

diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 # ******************************************************************************
 
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.13)
 
 project (pyngraph)
 

diff --git a/openvino/CMakeLists.txt b/openvino/CMakeLists.txt
@@ -14,8 +14,6 @@
 # limitations under the License.
 # ******************************************************************************
 
-cmake_minimum_required(VERSION 3.10)
-
 add_subdirectory(itt)
 
 openvino_developer_export_targets(openvino::itt)
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
@@ -2,16 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(ENABLE_DOCKER)
-    cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-else()
-    if (APPLE)
-        # due to https://cmake.org/cmake/help/v3.12/policy/CMP0068.html
-        cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-    else()
-        cmake_minimum_required(VERSION 3.7.2 FATAL_ERROR)
-    endif()
-endif()
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

diff --git a/tests/stress_tests/CMakeLists.txt b/tests/stress_tests/CMakeLists.txt
@@ -2,16 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(ENABLE_DOCKER)
-    cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-else()
-    if (APPLE)
-        # due to https://cmake.org/cmake/help/v3.12/policy/CMP0068.html
-        cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-    else()
-        cmake_minimum_required(VERSION 3.7.2 FATAL_ERROR)
-    endif()
-endif()
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 if (CMAKE_BUILD_TYPE STREQUAL "")
     message(STATUS "CMAKE_BUILD_TYPE not defined, 'Release' will be used")

diff --git a/tests/time_tests/CMakeLists.txt b/tests/time_tests/CMakeLists.txt
@@ -2,16 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(ENABLE_DOCKER)
-    cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-else()
-    if (APPLE)
-        # due to https://cmake.org/cmake/help/v3.12/policy/CMP0068.html
-        cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-    else()
-        cmake_minimum_required(VERSION 3.7.2 FATAL_ERROR)
-    endif()
-endif()
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 if (CMAKE_BUILD_TYPE STREQUAL "")
     message(STATUS "CMAKE_BUILD_TYPE not defined, 'Release' will be used")