diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 469f4c01..3e0ef0ef 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -105,20 +105,20 @@ jobs: }, lib: "libc++", } -# - { -# name: "Ubuntu Clang-18 + libc++", -# os: ubuntu-latest, -# compiler: -# { -# type: CLANG, -# version: 18, -# conan: "clang", -# cc: "clang-18", -# cxx: "clang++-18", -# std: 20 -# }, -# lib: "libc++", -# } + - { + name: "Ubuntu Clang-18 + libc++", + os: ubuntu-latest, + compiler: + { + type: CLANG, + version: 18, + conan: "clang", + cc: "clang-18", + cxx: "clang++-18", + std: 23 + }, + lib: "libc++", + } # - { # name: "Ubuntu Clang-19 + libc++", # os: ubuntu-latest, diff --git a/conanfile.py b/conanfile.py index 43261244..272ca10c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -121,7 +121,7 @@ def useFMT(self): compiler = self.settings.compiler version = Version(self.settings.compiler.version) std_support = (compiler == "msvc" and version >= 193) or (compiler == "gcc" and version >= Version("14")) or \ - (compiler == "clang" and version >= Version("18")) + (compiler == "clang" and version >= Version("19")) return not std_support def config_options(self): diff --git a/libraries/core/src/morpheus/core/conformance/CMakeLists.txt b/libraries/core/src/morpheus/core/conformance/CMakeLists.txt index 2837f55c..290af77e 100644 --- a/libraries/core/src/morpheus/core/conformance/CMakeLists.txt +++ b/libraries/core/src/morpheus/core/conformance/CMakeLists.txt @@ -35,7 +35,7 @@ morpheus_conformance_check( RESULT FORMAT_SUPPORTED MSVC_VERSION "19.37" GNU_VERSION "14" - CLANG_VERSION "18" + CLANG_VERSION "19" ) if (NOT ${DATE_SUPPORTED})