Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduced warning level in Unity build #2672

Merged
merged 2 commits into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ script:
./setup.sh;
./build.sh || travis_terminate 1;
echo "Starting Unity Build!";
cd Unity && ./build.sh 2> Unity_error.txt || ((cat Unity_error.txt | grep -i "error:" -B 10 -A 10) && exit 1);
cd Unity && ./build.sh || travis_terminate 1;
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export PATH=$MSBUILD_PATH:$PATH_FIX:$PATH;
cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&'
Expand All @@ -54,5 +54,5 @@ script:
./setup.sh;
./build.sh || travis_terminate 1;
echo "Starting Unity Build!";
cd Unity && ./build.sh 2> Unity_error.txt || ((cat Unity_error.txt | grep -i "error:" -B 10 -A 10) && exit 1);
cd Unity && ./build.sh || travis_terminate 1;
fi
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SimModeWorldMultiRotor : public SimModeWorldBase
virtual void BeginPlay() override;
virtual void EndPlay() override;
void Tick(float DeltaSeconds) override;
UnityPawn* GetVehiclePawn();
UnityPawn* GetVehiclePawn() override;

private:
typedef FlyingPawn TVehiclePawn;
Expand Down
2 changes: 1 addition & 1 deletion Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase
virtual void pause(bool is_paused) override;
virtual void continueForTime(double seconds) override;
virtual void setTimeOfDay(bool is_enabled, const std::string& start_datetime, bool is_start_datetime_dst,
float celestial_clock_speed, float update_interval_secs, bool move_sun);
float celestial_clock_speed, float update_interval_secs, bool move_sun) override;

virtual void enableWeather(bool enable) override;
virtual void setWeatherParameter(WeatherParameter param, float val) override;
Expand Down
4 changes: 2 additions & 2 deletions Unity/AirLibWrapper/AirsimWrapper/cmake/rpc-setup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
# clang is the compiler used for developing mainly, so
# this is where I set the highest warning level
list(APPEND RPCLIB_BUILD_FLAGS
-Wall -pedantic -Weverything -Wno-c++98-compat
-Wall -Wextra -Wno-c++98-compat
-Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-prototypes
-Wno-undef -pthread)

Expand Down Expand Up @@ -268,7 +268,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
# clang is the compiler used for developing mainly, so
# this is where I set the highest warning level
list(APPEND RPCLIB_BUILD_FLAGS
-Wall -pedantic -Weverything -Wno-c++98-compat
-Wall -Wextra -Wno-c++98-compat
-Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-prototypes
-Wno-undef -pthread)

Expand Down