Skip to content

Commit bf41b3f

Browse files
authored
Merge pull request #8 from manumerous/update/cpp20
Update stack to cpp20 and cleanup legacy makefile commands
2 parents f465b71 + 00058ab commit bf41b3f

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

Makefile

+1-8
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ BUILD_TYPE ?= Release
5858
BUILD_TESTING ?= ON
5959
BUILD_WITH_NINJA ?= ON
6060
PARALLEL_JOBS ?= 6
61-
CPP_VERSION ?= -std=c++17
61+
CPP_VERSION ?= -std=c++20
6262

6363
############################################################
6464
# Set flags based on configuration
@@ -69,7 +69,6 @@ COMMON_CMAKE_ARGS ?= \
6969
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
7070
-DBUILD_TESTING=$(BUILD_TESTING) \
7171
-DCMAKE_SHARED_LINKER_FLAGS=$(LINKER_FLAGS) \
72-
-DBUILD_HOST_ONEX_OS=$(BUILD_HOST_ONEX_OS) \
7372
-DCMAKE_CXX_FLAGS=$(CPP_VERSION)
7473

7574
# Conditionally add flags specific for the Ninja build system
@@ -201,12 +200,6 @@ launch-wb-neo-dummy-sim:
201200
source install/setup.bash && \
202201
ros2 launch neo_wb_mpc wb_dummy_sim.launch.py
203202

204-
test-pinocchio-model:
205-
cd ${build_dir} && \
206-
source ${ros_source_file} && \
207-
source install/setup.bash && \
208-
ros2 run humanoid_centroidal_mpc test_pinocchio_model
209-
210203
run-ocs2-tests:
211204
echo "make sure you call 'make build-relwithdebinfo' to build the tests before running them." && \
212205
cd ${build_dir} && \

0 commit comments

Comments
 (0)