Allow to choose C++ version in cmake command line

CMakeLists.txt

@@ -83,6 +83,10 @@ else()
   option(WITH_FOLLY_DISTRIBUTED_MUTEX "build with folly::DistributedMutex" OFF)
 endif()
 
+if( NOT DEFINED CMAKE_CXX_STANDARD )
+  set(CMAKE_CXX_STANDARD 11)
+endif()
+
 include(CMakeDependentOption)
 CMAKE_DEPENDENT_OPTION(WITH_GFLAGS "build with GFlags" ON
   "NOT MSVC;NOT MINGW" OFF)
@@ -191,7 +195,6 @@ else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format -fno-asynchronous-unwind-tables")
     add_definitions(-D_POSIX_C_SOURCE=1)
   endif()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
     include(CheckCXXCompilerFlag)
@@ -255,25 +258,6 @@ if(NOT MSVC)
   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
 endif()
 
-CHECK_CXX_SOURCE_COMPILES("
-
-struct test {
-  int lambda() {
-    return [=]() { return value_; }();
-  }
-
-  int value_;
-};
-
-int main() {
-  test t;
-  t.lambda();
-}
-" HAVE_IMPLICIT_THIS_LAMBDA_CAPTURE)
-if(HAVE_IMPLICIT_THIS_LAMBDA_CAPTURE)
-  add_definitions(-DROCKSDB_SUPPORT_IMPLICIT_THIS_LAMBDA_CAPTURE)
-endif()
-
 CHECK_CXX_SOURCE_COMPILES("
 #include <cstdint>
 #include <nmmintrin.h>
@@ -515,6 +499,32 @@ if(HAVE_AUXV_GETAUXVAL)
   add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
 endif()
 
+# Workaround to get c++ std version option coming from CMAKE_CXX_STANDARD for try_compile 
+include(CxxFlags)
+get_cxx_std_flags(CMAKE_REQUIRED_FLAGS)
+
+CHECK_CXX_SOURCE_COMPILES("
+struct test {
+  int lambda() {
+    return [=]() { return value_; }();
+  }
+
+  int value_;
+};
+
+int main() {
+  test t;
+  t.lambda();
+}
+" HAVE_IMPLICIT_THIS_LAMBDA_CAPTURE
+)
+
+unset(CMAKE_REQUIRED_FLAGS)
+
+if(HAVE_IMPLICIT_THIS_LAMBDA_CAPTURE)
+  add_definitions(-DROCKSDB_SUPPORT_IMPLICIT_THIS_LAMBDA_CAPTURE)
+endif()
+
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.8.1/fused-src)
@@ -868,7 +878,6 @@ if(ROCKSDB_BUILD_SHARED)
                           LINKER_LANGUAGE CXX
                           VERSION ${rocksdb_VERSION}
                           SOVERSION ${rocksdb_VERSION_MAJOR}
-                          CXX_STANDARD 11
                           OUTPUT_NAME "rocksdb")
   endif()
 endif()
@@ -961,7 +970,7 @@ if(WITH_TESTS)
   add_library(testharness STATIC
   test_util/testharness.cc)
   target_link_libraries(testharness gtest)
-
+                            
   set(TESTS
         cache/cache_test.cc
         cache/lru_cache_test.cc
@@ -1145,7 +1154,7 @@ if(WITH_TESTS)
         PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD_RELEASE 1
         EXCLUDE_FROM_DEFAULT_BUILD_MINRELEASE 1
         EXCLUDE_FROM_DEFAULT_BUILD_RELWITHDEBINFO 1
-        )
+  )
 
   foreach(sourcefile ${TESTS})
       get_filename_component(exename ${sourcefile} NAME_WE)
@@ -1155,7 +1164,7 @@ if(WITH_TESTS)
         EXCLUDE_FROM_DEFAULT_BUILD_MINRELEASE 1
         EXCLUDE_FROM_DEFAULT_BUILD_RELWITHDEBINFO 1
         OUTPUT_NAME ${exename}${ARTIFACT_SUFFIX}
-        )
+      )
       target_link_libraries(${CMAKE_PROJECT_NAME}_${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${ROCKSDB_LIB})
       if(NOT "${exename}" MATCHES "db_sanity_test")
         add_test(NAME ${exename} COMMAND ${exename}${ARTIFACT_SUFFIX})
@@ -1235,4 +1244,4 @@ if(WITH_TOOLS)
   add_subdirectory(db_stress_tool)
   add_custom_target(tools
     DEPENDS ${tool_deps})
-endif()
+endif()

cmake/modules/CxxFlags.cmake

@@ -0,0 +1,7 @@
+macro(get_cxx_std_flags FLAGS_VARIABLE)
+  if( CMAKE_CXX_STANDARD_REQUIRED )
+    set(${FLAGS_VARIABLE} ${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION})
+  else()
+    set(${FLAGS_VARIABLE} ${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION})
+  endif()
+endmacro()

third-party/folly/folly/synchronization/Baton.h

@@ -249,7 +249,12 @@ class Baton {
   bool tryWaitSlow(
       const std::chrono::time_point<Clock, Duration>& deadline,
       const WaitOptions& opt) noexcept {
+
+#ifdef ROCKSDB_SUPPORT_IMPLICIT_THIS_LAMBDA_CAPTURE
     switch (detail::spin_pause_until(deadline, opt, [=] { return ready(); })) {
+#else
+    switch (detail::spin_pause_until(deadline, opt, [=, this] { return ready(); })) {
+#endif
       case detail::spin_result::success:
         return true;
       case detail::spin_result::timeout:
@@ -259,7 +264,11 @@ class Baton {
     }
 
     if (!MayBlock) {
+#ifdef ROCKSDB_SUPPORT_IMPLICIT_THIS_LAMBDA_CAPTURE
       switch (detail::spin_yield_until(deadline, [=] { return ready(); })) {
+#else
+      switch (detail::spin_yield_until(deadline, [=, this] { return ready(); })) {
+#endif
         case detail::spin_result::success:
           return true;
         case detail::spin_result::timeout: