Merge pull request #6481 from STEllAR-GROUP/cxx_version

Fixing use of HPX_WITH_CXX_STANDARD
STEllAR-GROUP · May 3, 2024 · 85c3c8f · 85c3c8f
2 parents 9f92313 + 311ede2
commit 85c3c8f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/cmake/HPX_CheckCXXStandard.cmake b/cmake/HPX_CheckCXXStandard.cmake
@@ -73,4 +73,11 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # standard for .cu files.
 set(CMAKE_CXX_STANDARD_DEFAULT 98)
 
-hpx_info("Using C++${HPX_CXX_STANDARD}")
+# Make sure HPX_WITH_CXX_STANDARD reflects the user's selection
+hpx_set_option(
+  HPX_WITH_CXX_STANDARD
+  VALUE ${HPX_CXX_STANDARD}
+  FORCE
+)
+
+hpx_info("Using C++${HPX_WITH_CXX_STANDARD}")