Skip to content

Commit 8237a7d

Browse files
committed
fix build
1 parent aed629c commit 8237a7d

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
# Read the full text in the LICENSE.md file.
1717
#
1818

19-
cmake_minimum_required(VERSION 3.14)
19+
cmake_minimum_required(VERSION 3.10.2)
2020

2121
project(gazebo-rcll)
2222
include(GNUInstallDirs)
2323

2424
include(third_party/third_party.cmake)
25-
25+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
2626
set(USERDIR
2727
".config/rcll/gazebo"
2828
CACHE

plugins/src/plugins/mps/mps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const std::map<std::string, std::string> Mps::name_id_match = {
5050

5151
///Constructor
5252
Mps::Mps(physics::ModelPtr _parent, sdf::ElementPtr)
53-
: model_(_parent), name_(model_->GetName()), sclt_in(this), sclt_base(this), shutdown_(false)
53+
: shutdown_(false), model_(_parent), name_(model_->GetName()), sclt_in(this), sclt_base(this)
5454
{
5555
auto sinks = spdlog::default_logger()->sinks();
5656
sinks.push_back(

third_party/third_party.cmake

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
include(FetchContent)
1+
#include(FetchContent)
22
find_package(spdlog QUIET)
33
if (spdlog_FOUND)
44
message(STATUS "Found spdlog on system")
55
else()
6-
message(STATUS "Fetching spdlog")
7-
FetchContent_Declare(
8-
spdlog
9-
GIT_REPOSITORY https://github.com/gabime/spdlog.git
10-
GIT_SHALLOW TRUE
11-
GIT_TAG v1.x
12-
)
6+
# message(STATUS "Fetching spdlog")
7+
# FetchContent_Declare(
8+
# spdlog
9+
# GIT_REPOSITORY https://github.com/gabime/spdlog.git
10+
# GIT_SHALLOW TRUE
11+
# GIT_TAG v1.x
12+
# )
1313
set(SPDLOG_BUILD_SHARED ON)
14-
FetchContent_MakeAvailable(spdlog)
14+
# FetchContent_MakeAvailable(spdlog)
1515
endif()
1616
find_package(FreeOpcUa QUIET)
1717
if (FreeOpcUa_FOUND)
1818
message(STATUS "Found FreeOpcUa on system")
1919
else()
20-
message(STATUS "Fetching freeopcua")
21-
FetchContent_Declare(
22-
FreeOpcUa
23-
GIT_REPOSITORY https://github.com/FreeOpcUa/freeopcua.git
24-
GIT_SHALLOW TRUE
25-
)
26-
FetchContent_MakeAvailable(FreeOpcUa)
20+
# message(STATUS "Fetching freeopcua")
21+
# FetchContent_Declare(
22+
# FreeOpcUa
23+
# GIT_REPOSITORY https://github.com/FreeOpcUa/freeopcua.git
24+
# GIT_SHALLOW TRUE
25+
# )
26+
# FetchContent_MakeAvailable(FreeOpcUa)
2727
endif()

0 commit comments

Comments
 (0)