Merge pull request #1759 from allisonvacanti/cpp20

alliepiper · web-flow · commit 88ec5b871d3b · 2022-08-04T15:09:36.000-04:00
Add option to build with C++20.
diff --git a/cmake/ThrustBuildTargetList.cmake b/cmake/ThrustBuildTargetList.cmake
@@ -19,7 +19,7 @@
 #   - <prop> is one of the following:
 #     - HOST: The host system. Valid values: CPP, OMP, TBB.
 #     - DEVICE: The device system. Valid values: CUDA, CPP, OMP, TBB.
-#     - DIALECT: The C++ dialect. Valid values: 11, 14, 17.
+#     - DIALECT: The C++ dialect. Valid values: 11, 14, 17, 20.
 #     - PREFIX: A unique prefix that should be used to name all
 #       targets/tests/examples that use this configuration.
 #
diff --git a/cmake/ThrustMultiConfig.cmake b/cmake/ThrustMultiConfig.cmake
@@ -7,7 +7,7 @@ function(thrust_configure_multiconfig)
 
   # Dialects:
   set(THRUST_CPP_DIALECT_OPTIONS
-    11 14 17
+    11 14 17 20
     CACHE INTERNAL "C++ dialects supported by Thrust." FORCE
   )
 
diff --git a/dependencies/cub b/dependencies/cub
@@ -1 +1 @@
-Subproject commit e882acc1e709feeb3c96f6f1d8a9fb7af9667823
+Subproject commit 5cf816f6516617588d1ceb3e4121ddb9f1c75271

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`# - <prop> is one of the following:`
`20`	`20`	`# - HOST: The host system. Valid values: CPP, OMP, TBB.`
`21`	`21`	`# - DEVICE: The device system. Valid values: CUDA, CPP, OMP, TBB.`
`22`		`-# - DIALECT: The C++ dialect. Valid values: 11, 14, 17.`
	`22`	`+# - DIALECT: The C++ dialect. Valid values: 11, 14, 17, 20.`
`23`	`23`	`# - PREFIX: A unique prefix that should be used to name all`
`24`	`24`	`# targets/tests/examples that use this configuration.`
`25`	`25`	`#`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function(thrust_configure_multiconfig)`
`7`	`7`
`8`	`8`	`# Dialects:`
`9`	`9`	`set(THRUST_CPP_DIALECT_OPTIONS`
`10`		`- 11 14 17`
	`10`	`+ 11 14 17 20`
`11`	`11`	`CACHE INTERNAL "C++ dialects supported by Thrust." FORCE`
`12`	`12`	`)`
`13`	`13`