Downgrade back to C++20, as RocksDB doesn't compile as C++23.

trailofbits · Sep 16, 2024 · 60323a9 · 60323a9
1 parent ffe8042
commit 60323a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/bin/Bootstrap/CMakeLists.txt b/bin/Bootstrap/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries("mx-bootstrap"
 
 target_compile_features("mx-bootstrap"
   PUBLIC
-    cxx_std_23
+    "cxx_std_${CMAKE_CXX_STANDARD}"
 )
 
 set_target_properties("mx-bootstrap"

diff --git a/bindings/Python/CMakeLists.txt b/bindings/Python/CMakeLists.txt
@@ -57,9 +57,9 @@ set_target_properties("mx-python"
     POSITION_INDEPENDENT_CODE
       YES
     COMPILE_FEATURES
-      cxx_std_23
+      "cxx_std_${CMAKE_CXX_STANDARD}"
     INTERFACE_COMPILE_FEATURES
-      cxx_std_23
+      "cxx_std_${CMAKE_CXX_STANDARD}"
 
     # Make sure we have the right output name, e.g.
     # `multiplier.cpython-312-darwin.so`.

diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -7,7 +7,7 @@
 
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type")
 set(CMAKE_EXPORT_COMPILE_COMMANDS true CACHE BOOL "Generate the compile_commands.json file (forced)" FORCE)
-set(CMAKE_CXX_STANDARD 23 CACHE STRING "C++ standard version")
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ standard version")
 
 set(MX_INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Directory in which Multiplier libraries will be installed")
 set(MX_INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Directory in which Multiplier binaries will be installed")

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -257,9 +257,9 @@ set_target_properties("mx-api"
     POSITION_INDEPENDENT_CODE
       YES
     COMPILE_FEATURES
-      cxx_std_23
+      "cxx_std_${CMAKE_CXX_STANDARD}"
     INTERFACE_COMPILE_FEATURES
-      cxx_std_23
+      "cxx_std_${CMAKE_CXX_STANDARD}"
 )
 
 add_library("multiplier" SHARED
@@ -293,9 +293,9 @@ set_target_properties("multiplier"
     POSITION_INDEPENDENT_CODE
       YES
     COMPILE_FEATURES
-      cxx_std_23
+      "cxx_std_${CMAKE_CXX_STANDARD}"
     INTERFACE_COMPILE_FEATURES
-      cxx_std_23
+      "cxx_std_${CMAKE_CXX_STANDARD}"
 
     # NOTE(pag): This is important! We need to emulate the shape of the
     #            install directories, so that install targets behave in the