Skip to content

Commit

Permalink
Merge pull request #1196 from mavlink/pr-move-to-cpp17-again
Browse files Browse the repository at this point in the history 
Move from C++11 to C++17 (second try)
  • Loading branch information
@julianoes
julianoes authored Nov 24, 2020
2 parents 9938794 + c6dca39 commit e869ba8
Show file tree
Hide file tree
Showing 54 changed files with 462 additions and 980 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,11 @@ jobs:
with:
submodules: recursive
- name: configure (ios)
run: cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$(pwd)/tools/ios.toolchain.cmake -DPLATFORM=OS -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DWERROR=OFF -j 2 -Bbuild/ios -H.
run: cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$(pwd)/tools/ios.toolchain.cmake -DPLATFORM=OS -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DWERROR=OFF -DDEPLOYMENT_TARGET=11.0 -j 2 -Bbuild/ios -H.
- name: build (ios)
run: cmake --build build/ios -j 2
- name: configure (ios_simulator)
run: cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$(pwd)/tools/ios.toolchain.cmake -DPLATFORM=SIMULATOR64 -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DWERROR=OFF -j 2 -Bbuild/ios_simulator -H.
run: cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$(pwd)/tools/ios.toolchain.cmake -DPLATFORM=SIMULATOR64 -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DWERROR=OFF -DDEPLOYMENT_TARGET=11.0 -j 2 -Bbuild/ios_simulator -H.
- name: build (ios_simulator)
run: cmake --build build/ios_simulator -j 2
- name: Package
Expand Down
213 changes: 0 additions & 213 deletions .ycm_extra_conf.py
View file

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.10.2)

execute_process(
COMMAND git describe --abbrev=8 --dirty --always --tags
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)
project(mavsdk_examples)

# This allows to build all examples at once.
Expand Down
9 changes: 6 additions & 3 deletions examples/battery/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(battery)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra ")
add_definitions("-std=c++17 -Wall -Wextra ")
# This warning is triggered by the MAVLink includes.
add_definitions("-Wno-address-of-packed-member")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-std=c++17 -WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/calibrate/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(calibrate)

find_package(Threads REQUIRED)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/fly_mission/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(fly_mission)

find_package(Threads REQUIRED)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/fly_multiple_drones/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(fly_multiple_drones)

find_package(Threads REQUIRED)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/fly_qgc_mission/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(fly_qgc_mission)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/follow_me/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(follow_me)

find_package(Threads REQUIRED)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/ftp_client/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(ftp_client)

find_package(Threads REQUIRED)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
9 changes: 6 additions & 3 deletions examples/ftp_server/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10.2)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(ftp_server)

find_package(Threads REQUIRED)

if(NOT MSVC)
add_definitions("-std=c++11 -Wall -Wextra")
add_definitions("-Wall -Wextra")
else()
add_definitions("-std=c++11 -WX -W2")
add_definitions("-WX -W2")
endif()

find_package(MAVSDK REQUIRED)
Expand Down
Loading

0 comments on commit e869ba8

Please sign in to comment.