Skip to content

Bump CMake minimum required version to 3.10 #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johguenther wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump CMake minimum required version to 3.10 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Copyright 2009-2021 Intel Corporation
## SPDX-License-Identifier: Apache-2.0

CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

SET(EMBREE_VERSION_MAJOR 4)
SET(EMBREE_VERSION_MINOR 4)
Expand Down Expand Up @@ -57,27 +57,15 @@ IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
ENDIF()

IF(COMMAND cmake_policy)
if (POLICY CMP0003)
cmake_policy(SET CMP0003 NEW)
endif()
if (POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
endif()
if(POLICY CMP0072)
cmake_policy(SET CMP0072 NEW)
endif()
if(POLICY CMP0022)
cmake_policy(SET CMP0022 NEW)
endif()
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
endif()
if(POLICY CMP0057)
cmake_policy(SET CMP0057 NEW)
endif()
ENDIF()

MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
Expand Down
2 changes: 1 addition & 1 deletion common/cmake/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#===============================================================================

# We use INTERFACE libraries, which are only supported in 3.x
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

# These two are used to automatically find the root and include directories.
set(_TBB_INCLUDE_SUBDIR "include")
Expand Down
2 changes: 1 addition & 1 deletion doc/src/compilation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ installation, put the path to `ispc` permanently into your `PATH` environment
variable or you set the `EMBREE_ISPC_EXECUTABLE` variable to point at the ISPC
executable during CMake configuration.

You additionally have to install CMake 3.1.0 or higher and the developer
You additionally have to install CMake 3.10 or higher and the developer
version of [GLFW](https://www.glfw.org/) version 3.

Under macOS, all these dependencies can be installed
Expand Down
2 changes: 1 addition & 1 deletion scripts/ospray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## Global settings ##

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependencies)

Expand Down
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ IF (EMBREE_TESTING_INSTALL_TESTS)
"# Copyright 2009-2021 Intel Corporation\n"
"# SPDX-License-Identifier: Apache-2.0\n"
"# This file was automatically generated\n"
"cmake_minimum_required(VERSION 3.5)\n"
"cmake_minimum_required(VERSION 3.10)\n"
"\n"
"project(embree-testing)\n"
"\n"
Expand Down Expand Up @@ -119,4 +119,4 @@ IF (EMBREE_TESTING_INSTALL_TESTS)
DESTINATION "${CMAKE_INSTALL_TESTDIR}"
COMPONENT testing)

ENDIF()
ENDIF()
4 changes: 2 additions & 2 deletions tutorials/embree_info/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## SPDX-License-Identifier: Apache-2.0

PROJECT(embree_info)
CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

IF (NOT EMBREE_PROJECT_COMPILATION)
FIND_PACKAGE(embree REQUIRED)
Expand Down Expand Up @@ -33,4 +33,4 @@ IF (COMMAND SIGN_TARGET)
SIGN_TARGET(embree_info)
ENDIF()

ADD_EMBREE_GENERIC_TEST(embree_info embree_info)
ADD_EMBREE_GENERIC_TEST(embree_info embree_info)
2 changes: 1 addition & 1 deletion tutorials/find_embree/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## SPDX-License-Identifier: Apache-2.0

PROJECT(find_embree)
CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

FIND_PACKAGE(embree REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion tutorials/minimal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## SPDX-License-Identifier: Apache-2.0

PROJECT(minimal)
CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

IF (NOT EMBREE_PROJECT_COMPILATION)
FIND_PACKAGE(embree REQUIRED)
Expand Down