Skip to content
This repository was archived by the owner on Feb 3, 2025. It is now read-only.

Fix build on Linux with conda-forge dependencies #2944

Merged
merged 2 commits into from
Mar 25, 2021
Merged

Fix build on Linux with conda-forge dependencies #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f48449
Do not manually add -std=c++11 to CMAKE_CXX_FLAGS
traversaro Mar 3, 2021
4d375a3
Update RestApi.cc
traversaro Mar 3, 2021
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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,8 @@ if (MSVC)
set(UNFILTERED_FLAGS "/EHsc")
endif()

# Visual Studio enables c++11 support by default
if (NOT MSVC)
set(UNFILTERED_FLAGS "-std=c++11")
set(UNFILTERED_FLAGS "")
endif()

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VALID_CXX_FLAGS} ${UNFILTERED_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion plugins/rest_web/RestApi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <cstring>
#include <stdlib.h>
#include <curl/curl.h>
#include <inttypes.h>
#include <cinttypes>

#include "RestApi.hh"

Expand Down