Skip to content

Commit

Permalink
Pin cmake policies to cmake 3.17 version (#310)
Browse files Browse the repository at this point in the history
Planning to upgrade to cmake 3.18 in the near future and the CUDA_ARCHITECTURES change is a breaking change, so pinning to 3.17 policies to prevent the breakages.
  • Loading branch information
Keith Kraus authored Nov 12, 2020
1 parent d1eed19 commit 45ad13f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## New Features

## Improvements
- PR #310 Pin cmake policies to cmake 3.17 version

## Bug Fixes

Expand Down
3 changes: 2 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)

cmake_minimum_required(VERSION 3.12...3.17 FATAL_ERROR)

project(CUDA_SPATIAL VERSION 0.17.0 LANGUAGES C CXX CUDA)

Expand Down
18 changes: 15 additions & 3 deletions cpp/benchmarks/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)

project(CUSPATIAL_BENCHMARKS LANGUAGES C CXX CUDA)
#=============================================================================
# Copyright (c) 2019-2020, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================

if(NOT CMAKE_CUDA_COMPILER)
message(SEND_ERROR "CMake cannot locate a CUDA compiler")
Expand Down
3 changes: 0 additions & 3 deletions cpp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)

project(CUSPATIAL_TESTS LANGUAGES C CXX CUDA)

if(NOT CMAKE_CUDA_COMPILER)
message(SEND_ERROR "CMake cannot locate a CUDA compiler")
Expand Down

0 comments on commit 45ad13f

Please sign in to comment.