Skip to content

Commit 6e9460c

Browse files
authored
Drop C++14 compatibility (#6403)
* Drop C++14 compatibility Closes #6384 For reasons, see there. * Test: build without GPU on Ubuntu 20.04 * Test 2: WITH_CUDA=OFF * Switch tutorials CI to 24.04
1 parent 5299c30 commit 6e9460c

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.ci/azure-pipelines/azure-pipelines.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ stages:
5050
CONTAINER: env2004
5151
CC: gcc
5252
CXX: g++
53-
BUILD_GPU: ON
54-
CMAKE_ARGS: '-DPCL_WARNINGS_ARE_ERRORS=ON -DCMAKE_CXX_STANDARD=14 -DCMAKE_CUDA_STANDARD=14'
53+
BUILD_GPU: OFF
54+
CMAKE_ARGS: '-DWITH_CUDA=OFF -DPCL_WARNINGS_ARE_ERRORS=ON'
5555
24.04 GCC: # latest Ubuntu
5656
CONTAINER: env2404
5757
CC: gcc
5858
CXX: g++
5959
BUILD_GPU: ON
60-
CMAKE_ARGS: '-DCMAKE_CXX_STANDARD=17 -DCMAKE_CUDA_STANDARD=17'
60+
CMAKE_ARGS: ''
6161
container: $[ variables['CONTAINER'] ]
6262
timeoutInMinutes: 0
6363
variables:

.ci/azure-pipelines/docs-pipeline.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ resources:
1818
containers:
1919
- container: doc # for documentation.yaml
2020
image: pointcloudlibrary/doc
21-
- container: env2204 # for tutorials.yaml
22-
image: pointcloudlibrary/env:22.04
21+
- container: env2404 # for tutorials.yaml
22+
image: pointcloudlibrary/env:24.04
2323

2424
stages:
2525
- stage: formatting

.ci/azure-pipelines/tutorials.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ jobs:
22
- job: tutorials
33
displayName: Building Tutorials
44
pool:
5-
vmImage: 'ubuntu-22.04'
6-
container: env2204
5+
vmImage: 'ubuntu-24.04'
6+
container: env2404
77
timeoutInMinutes: 0
88
variables:
99
BUILD_DIR: '$(Agent.BuildDirectory)/build'

CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22
cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
33

44
# Set target C++ standard and required compiler features
5-
set(CMAKE_CXX_STANDARD 17 CACHE STRING "The target C++ standard. PCL requires C++14 or higher.")
5+
set(CMAKE_CXX_STANDARD 17 CACHE STRING "The target C++ standard. PCL requires C++17 or higher.")
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
77
set(CMAKE_CXX_EXTENSIONS OFF)
88
if("${CMAKE_CXX_STANDARD}" GREATER_EQUAL 17)
99
set(PCL_CXX_COMPILE_FEATURES cxx_std_17)
1010
set(PCL__cplusplus 201703L)
1111
set(PCL_REQUIRES_MSC_VER 1912)
12-
elseif("${CMAKE_CXX_STANDARD}" EQUAL 14)
13-
set(PCL_CXX_COMPILE_FEATURES cxx_std_14)
14-
set(PCL__cplusplus 201402L)
15-
set(PCL_REQUIRES_MSC_VER 1900)
1612
else()
17-
message(FATAL_ERROR "Unknown or unsupported C++ standard specified")
13+
message(FATAL_ERROR "Unknown or unsupported C++ standard specified. PCL requires C++17 or higher")
1814
endif()
1915

20-
set(CMAKE_CUDA_STANDARD 17 CACHE STRING "The target CUDA/C++ standard. PCL requires CUDA/C++ 14 or higher.")
16+
set(CMAKE_CUDA_STANDARD 17 CACHE STRING "The target CUDA/C++ standard. PCL requires CUDA/C++ 17 or higher.")
2117
set(CMAKE_CUDA_STANDARD_REQUIRED ON)
2218

2319
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "possible configurations" FORCE)

0 commit comments

Comments
 (0)