Merge pull request #1265 from LLNL/bugfix/chapman39/locale_error_cuda

Set System.cpp back to cpp due to nvcc compiler error
LLNL · Feb 6, 2024 · b98abba · b98abba
2 parents a29fc73 + 90f9951
commit b98abba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -60,6 +60,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 - Upgrades our `vcpkg` usage for automated Windows builds of our TPLs to its [2023.12.12 release](https://github.com/microsoft/vcpkg/releases/tag/2023.12.12)
 - Fixed a bug in the bounds checks for `primal::clip(Triangle, BoundingBox)`
 - Fixed a bug when loading Sidre groups with attributes that already exist
+- Fixed `std::locale` error when when compiling `src/axom/core/utilities/System.cpp` using nvcc
 
 ## [Version 0.8.1] - Release date 2023-08-16
 

diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt
@@ -122,6 +122,9 @@ axom_add_library(NAME        core
                  FOLDER      axom/core
                  )
 
+# Set file back to C++ due to nvcc compiler error
+set_source_files_properties(utilities/System.cpp PROPERTIES LANGUAGE CXX)
+
 # Basic includes that should be inherited to all Axom targets
 target_include_directories(core PUBLIC 
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>