Skip to content

Commit fcffcd9

Browse files
authored
Fix build on Linux with conda-forge dependencies (gazebosim#2944)
* Do not manually add -std=c++11 to CMAKE_CXX_FLAGS * Update RestApi.cc
1 parent 0b78ec1 commit fcffcd9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,8 @@ if (MSVC)
285285
set(UNFILTERED_FLAGS "/EHsc")
286286
endif()
287287

288-
# Visual Studio enables c++11 support by default
289288
if (NOT MSVC)
290-
set(UNFILTERED_FLAGS "-std=c++11")
289+
set(UNFILTERED_FLAGS "")
291290
endif()
292291

293292
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VALID_CXX_FLAGS} ${UNFILTERED_FLAGS}")

plugins/rest_web/RestApi.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <cstring>
1919
#include <stdlib.h>
2020
#include <curl/curl.h>
21-
#include <inttypes.h>
21+
#include <cinttypes>
2222

2323
#include "RestApi.hh"
2424

0 commit comments

Comments
 (0)