Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
pkohout committed Jun 21, 2022
1 parent aed629c commit 8237a7d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
# Read the full text in the LICENSE.md file.
#

cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.10.2)

project(gazebo-rcll)
include(GNUInstallDirs)

include(third_party/third_party.cmake)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
set(USERDIR
".config/rcll/gazebo"
CACHE
Expand Down
2 changes: 1 addition & 1 deletion plugins/src/plugins/mps/mps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const std::map<std::string, std::string> Mps::name_id_match = {

///Constructor
Mps::Mps(physics::ModelPtr _parent, sdf::ElementPtr)
: model_(_parent), name_(model_->GetName()), sclt_in(this), sclt_base(this), shutdown_(false)
: shutdown_(false), model_(_parent), name_(model_->GetName()), sclt_in(this), sclt_base(this)
{
auto sinks = spdlog::default_logger()->sinks();
sinks.push_back(
Expand Down
32 changes: 16 additions & 16 deletions third_party/third_party.cmake
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
include(FetchContent)
#include(FetchContent)
find_package(spdlog QUIET)
if (spdlog_FOUND)
message(STATUS "Found spdlog on system")
else()
message(STATUS "Fetching spdlog")
FetchContent_Declare(
spdlog
GIT_REPOSITORY https://github.com/gabime/spdlog.git
GIT_SHALLOW TRUE
GIT_TAG v1.x
)
# message(STATUS "Fetching spdlog")
# FetchContent_Declare(
# spdlog
# GIT_REPOSITORY https://github.com/gabime/spdlog.git
# GIT_SHALLOW TRUE
# GIT_TAG v1.x
# )
set(SPDLOG_BUILD_SHARED ON)
FetchContent_MakeAvailable(spdlog)
# FetchContent_MakeAvailable(spdlog)
endif()
find_package(FreeOpcUa QUIET)
if (FreeOpcUa_FOUND)
message(STATUS "Found FreeOpcUa on system")
else()
message(STATUS "Fetching freeopcua")
FetchContent_Declare(
FreeOpcUa
GIT_REPOSITORY https://github.com/FreeOpcUa/freeopcua.git
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(FreeOpcUa)
# message(STATUS "Fetching freeopcua")
# FetchContent_Declare(
# FreeOpcUa
# GIT_REPOSITORY https://github.com/FreeOpcUa/freeopcua.git
# GIT_SHALLOW TRUE
# )
# FetchContent_MakeAvailable(FreeOpcUa)
endif()

0 comments on commit 8237a7d

Please sign in to comment.