Skip to content

Commit ad38ee1

Browse files
committed
fix(panda): compile old libfranka version with c++17
1 parent b927630 commit ad38ee1

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

extensions/rcs_fr3/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ cpplint:
1313
clang-tidy -p=build --warnings-as-errors='*' $(shell find ${CPPSRC} -name '*.cpp' -o -name '*.cc' -name '*.h')
1414

1515
gcccompile:
16-
pip install --upgrade --requirement requirements_dev.txt
1716
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -B build -G Ninja
1817
cmake --build build --target _core
1918

2019
clangcompile:
21-
pip install --upgrade --requirement requirements_dev.txt
2220
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -G Ninja
2321
cmake --build build --target _core
2422

extensions/rcs_panda/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ FetchContent_Declare(pybind11
6363
)
6464

6565
FetchContent_MakeAvailable(libfranka pybind11)
66-
set_target_properties(franka PROPERTIES CXX_STANDARD 20)
66+
set_target_properties(franka PROPERTIES CXX_STANDARD 17)
6767

6868
add_subdirectory(src_fr3)

extensions/rcs_panda/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ cpplint:
1313
clang-tidy -p=build --warnings-as-errors='*' $(shell find ${CPPSRC} -name '*.cpp' -o -name '*.cc' -name '*.h')
1414

1515
gcccompile:
16-
pip install --upgrade --requirement requirements_dev.txt
1716
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -B build -G Ninja
1817
cmake --build build --target _core
1918

2019
clangcompile:
21-
pip install --upgrade --requirement requirements_dev.txt
2220
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -G Ninja
2321
cmake --build build --target _core
2422

0 commit comments

Comments
 (0)