Description: Declare c++11 flag unconditional
Author: Jose Luis Rivero <jrivero@osrfoundation.org>
Forwarded: No

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c54c198..40f1cdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,7 @@ else()
 
   # Unable to be filtered flags (failing due to limitations in filter_valid_compiler_warnings)
   set(UNFILTERED_FLAGS "-Wc++11-compat")
+  set(UNFILTERED_FLAGS "-std=c++11")
 endif()
 
 filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake
index 0903872..aaaaf5b 100644
--- a/cmake/DefaultCFlags.cmake
+++ b/cmake/DefaultCFlags.cmake
@@ -36,11 +36,6 @@ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
 set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
 
-# Visual Studio enables c++11 support by default
-if (NOT MSVC)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}} -std=c++11")
-endif()
-
 if (UNIX)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
