Skip to content

Commit

Permalink
Merge pull request eProsima#160 from clalancette/fix-std-flag
Browse files Browse the repository at this point in the history 
Change --std=c++11 to -std=c++11.
  • Loading branch information
@richiware
richiware authored Dec 18, 2017
2 parents 414e033 + 62edb40 commit ebb5fb9
Show file tree
Hide file tree
Showing 21 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions cmake/dev/check_configuration.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ macro(check_stdcxx)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" CACHE STRING "" FORCE)
set(HAVE_CXX11 1)
set(HAVE_CXX0X 1)
else()
set(HAVE_CXX11 0)
check_cxx_compiler_flag(--std=c++0x SUPPORTS_CXX0X)
check_cxx_compiler_flag(-std=c++0x SUPPORTS_CXX0X)
if(SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" CACHE STRING "" FORCE)
set(HAVE_CXX0X 1)
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/ClientServerTest/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/Configurability/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/DeadlineQoSExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ endif()
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/Filtering/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/FlowControlExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/HelloWorldExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/HistoryKind/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/Keys/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/LateJoiners/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/OwnershipStrengthQoSExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/RTPSTest_as_socket/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/RTPSTest_registered/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/SampleConfig_Controller/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/SampleConfig_Events/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/SampleConfig_Multimedia/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/SecureHelloWorldExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/StaticHelloWorldExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/UserDefinedTransportExample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
4 changes: 2 additions & 2 deletions examples/C++/XMLProfiles/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ find_package(fastrtps REQUIRED)
include(CheckCXXCompilerFlag)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
check_cxx_compiler_flag(--std=c++11 SUPPORTS_CXX11)
check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
if(SUPPORTS_CXX11)
add_compile_options(--std=c++11)
add_compile_options(-std=c++11)
else()
message(FATAL_ERROR "Compiler doesn't support C++11")
endif()
Expand Down
2 changes: 1 addition & 1 deletion utils/outdatedTests/ThriftLatency/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

CPP=c++
CPP_FLAGS= --std=c++0x
CPP_FLAGS= -std=c++0x
LIBS= -lthrift

SOURCE_FILES= main.cpp ApacheClient.cpp LatencyTest.cpp ApacheServer.cpp
Expand Down

0 comments on commit ebb5fb9

Please sign in to comment.