diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e5bbb8bb..b247ccf9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -341,9 +341,6 @@ add_subdirectory(src)
 add_subdirectory(include/fcl)
 
 set(PKG_DESC "Flexible Collision Library")
-if(NOT MSVC)
-    set(PKG_CFLAGS "-std=c++11")
-endif()
 configure_file(fcl.pc.in fcl.pc @ONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fcl.pc"
diff --git a/CMakeModules/CompilerSettings.cmake b/CMakeModules/CompilerSettings.cmake
index 96b9e1f73..645ca3805 100644
--- a/CMakeModules/CompilerSettings.cmake
+++ b/CMakeModules/CompilerSettings.cmake
@@ -33,7 +33,7 @@
 
 # GCC
 if(CMAKE_COMPILER_IS_GNUCXX)
-    add_definitions(-std=c++11 -W -Wall -Wextra -Wpedantic)
+    add_definitions(-W -Wall -Wextra -Wpedantic)
     if(FCL_TREAT_WARNINGS_AS_ERRORS)
         add_definitions(-Werror)
     endif()
@@ -41,7 +41,7 @@ endif()
 
 # Clang
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_definitions(-std=c++11 -W -Wall -Wextra)
+    add_definitions(-W -Wall -Wextra)
     if(FCL_TREAT_WARNINGS_AS_ERRORS)
         add_definitions(-Werror)
     endif()
@@ -53,7 +53,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
         message(FATAL_ERROR "AppleClang version must be at least 6.1!")
     endif()
-    add_definitions(-std=c++11 -W -Wall -Wextra)
+    add_definitions(-W -Wall -Wextra)
     if(FCL_TREAT_WARNINGS_AS_ERRORS)
         add_definitions(-Werror)
     endif()
@@ -77,7 +77,7 @@ else()
     set(IS_ICPC 0)
 endif()
 if(IS_ICPC)
-    add_definitions(-std=c++11 -wd191 -wd411 -wd654 -wd1125 -wd1292 -wd1565 -wd1628 -wd2196)
+    add_definitions(-wd191 -wd411 -wd654 -wd1125 -wd1292 -wd1565 -wd1628 -wd2196)
     set(CMAKE_AR "xiar" CACHE STRING "Intel archiver" FORCE)
     set(CMAKE_CXX_FLAGS "-pthread" CACHE STRING "Default compile flags" FORCE)
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG"
@@ -97,7 +97,7 @@ else()
     set(IS_XLC 0)
 endif()
 if(IS_XLC)
-    add_definitions(-std=c++11 -qpic -q64 -qmaxmem=-1)
+    add_definitions(-qpic -q64 -qmaxmem=-1)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -q64")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -q64")
 endif()
diff --git a/fcl.pc.in b/fcl.pc.in
index cb5ad784d..8d7bfca22 100644
--- a/fcl.pc.in
+++ b/fcl.pc.in
@@ -9,4 +9,4 @@ Description: @PKG_DESC@
 Version: @FCL_VERSION@
 Requires: @PKG_EXTERNAL_DEPS@
 Libs: -L${libdir} -l@PROJECT_NAME@
-Cflags: @PKG_CFLAGS@ -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 425724e78..05ed2ae7c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,8 @@ else()
   add_library(${PROJECT_NAME} SHARED ${FCL_HEADERS} ${FCL_SOURCE_CODE})
 endif()
 
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
+
 # Be sure to pass to the consumer the set of SIMD used in the compilation
 target_compile_options(${PROJECT_NAME} PUBLIC ${SSE_FLAGS})
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 50e1c1c7b..0c691a1ce 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,7 +33,7 @@ execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results
 include_directories(${GTEST_INCLUDE_DIRS})
 
 add_library(test_fcl_utility test_fcl_utility.cpp)
-target_link_libraries(test_fcl_utility fcl)
+target_link_libraries(test_fcl_utility PUBLIC fcl)
 
 # test file list
 set(tests
@@ -75,7 +75,7 @@ macro(add_fcl_test test_file_name)
   # Get the name (i.e. bla.cpp => bla)
   get_filename_component(test_name ${ARGV} NAME_WE)
   add_executable(${test_name} ${ARGV})
-  target_link_libraries(${test_name} fcl test_fcl_utility gtest)
+  target_link_libraries(${test_name} PRIVATE fcl test_fcl_utility gtest)
   add_test(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 endmacro(add_fcl_test)