fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 03:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename Mixer to MixerBase to resolve case-insensitivity on mac

Browse Source
This commit is contained in:
Steve Nogar
2020-07-31 09:37:49 -04:00
committed by Daniel Agar
parent 342b1c5ded
commit 48bf9268c3
14 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/mixer/MultirotorMixer/CMakeLists.txt
+2 -2
View File
@@ -92,7 +92,7 @@ add_library(MultirotorMixer
${CMAKE_CURRENT_BINARY_DIR}/mixer_multirotor_normalized.generated.h
${CMAKE_CURRENT_BINARY_DIR}/mixer_multirotor_6dof.generated.h
)
target_link_libraries(MultirotorMixer PRIVATE Mixer)
target_link_libraries(MultirotorMixer PRIVATE MixerBase)
target_include_directories(MultirotorMixer PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
add_dependencies(MultirotorMixer mixer_gen mixer_gen_6dof prebuild_targets)
@@ -104,7 +104,7 @@ if(BUILD_TESTING)
)
target_compile_definitions(test_mixer_multirotor PRIVATE MIXER_MULTIROTOR_USE_MOCK_GEOMETRY)
target_compile_options(test_mixer_multirotor PRIVATE -Wno-unused-result)
target_link_libraries(test_mixer_multirotor PRIVATE Mixer)
target_link_libraries(test_mixer_multirotor PRIVATE MixerBase)
add_test(NAME mixer_multirotor
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mixer_multirotor.py --test --mixer-multirotor-binary $<TARGET_FILE:test_mixer_multirotor>
src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp
+1 -1
View File
@@ -33,7 +33,7 @@
#pragma once
#include <mixer/Mixer/Mixer.hpp>
#include <mixer/MixerBase/Mixer.hpp>
/**
* Supported multirotor geometries.