Merge topic 'cxx-module-extensions'

45d1925efc Treat '.ccm', '.cxxm', and '.c++m' files as C++ sources 8c96d145c1 Tests/RunCMake: Match 'Tried extensions' output more robustly Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !8308
2026-08-04 14:50:23 +00:00 · 2023-03-10 16:08:02 +00:00
parent 9cf38e7b14 45d1925efc
commit d95ac61225
15 changed files with 39 additions and 39 deletions
--- a/Help/release/dev/cxx-module-extensions.rst
+++ b/Help/release/dev/cxx-module-extensions.rst
@@ -0,0 +1,5 @@
+cxx-module-extensions
+---------------------
+
+* Source file extensions ``.ccm``, ``.cxxm``, or ``.c++m`` are now
+  treated as C++.
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -37,7 +37,7 @@ set(CMAKE_CXX_ABI_COMPILED @CMAKE_CXX_ABI_COMPILED@)
 set(CMAKE_CXX_COMPILER_ENV_VAR "CXX")

 set(CMAKE_CXX_COMPILER_ID_RUN 1)
-set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;mpp;CPP;ixx;cppm)
+set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;mpp;CPP;ixx;cppm;ccm;cxxm;c++m)
 set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)

 foreach (lang C OBJC OBJCXX)
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1229,7 +1229,7 @@ void cmMakefile::AddCustomCommandOldStyle(

  // Each output must get its own copy of this rule.
  cmsys::RegularExpression sourceFiles(
-    "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|mpp|ixx|cppm|cu|m|mm|"
+    "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|mpp|ixx|cppm|ccm|cxxm|c\\+\\+m|cu|m|mm|"
    "rc|def|r|odl|idl|hpj|bat|h|h\\+\\+|"
    "hm|hpp|hxx|in|txx|inl)$");

--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -183,8 +183,8 @@ private:
 #define CM_HEADER_REGEX "\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$"

 #define CM_SOURCE_REGEX                                                       \
-  "\\.(C|F|M|c|c\\+\\+|cc|cpp|mpp|cxx|ixx|cppm|cu|f|f90|for|fpp|ftn|m|mm|"    \
-  "rc|def|r|odl|idl|hpj|bat)$"
+  "\\.(C|F|M|c|c\\+\\+|cc|cpp|mpp|cxx|ixx|cppm|ccm|cxxm|c\\+\\+m|cu"          \
+  "|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$"

 #define CM_PCH_REGEX "cmake_pch(_[^.]+)?\\.(h|hxx)$"

--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -335,7 +335,7 @@ cmake::cmake(Role role, cmState::Mode mode, cmState::ProjectKind projectKind)
    // The "c" extension MUST precede the "C" extension.
    setupExts(this->CLikeSourceFileExtensions,
              { "c", "C", "c++", "cc", "cpp", "cxx", "cu", "mpp", "m", "M",
-                "mm", "ixx", "cppm" });
+                "mm", "ixx", "cppm", "ccm", "cxxm", "c++m" });
    setupExts(this->HeaderFileExtensions,
              { "h", "hh", "h++", "hm", "hpp", "hxx", "in", "txx" });
    setupExts(this->CudaFileExtensions, { "cu" });
--- a/Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt
+++ b/Tests/RunCMake/CMP0115/CMP0115-OLD-stderr.txt
@@ -3,11 +3,9 @@

    noexist

-  Tried extensions [^
-]*
-  [^
-]*
-Call Stack \(most recent call first\):
+  Tried extensions ([^
+]+
+)+Call Stack \(most recent call first\):
  CMP0115-OLD\.cmake:[0-9]+ \(include\)
  CMakeLists\.txt:[0-9]+ \(include\)

--- a/Tests/RunCMake/CMP0115/CMP0115-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0115/CMP0115-WARN-stderr.txt
@@ -17,11 +17,9 @@ CMake Error at CMP0115\.cmake:[0-9]+ \(add_executable\):

    noexist

-  Tried extensions [^
-]*
-  [^
-]*
-Call Stack \(most recent call first\):
+  Tried extensions ([^
+]+
+)+Call Stack \(most recent call first\):
  CMP0115-WARN\.cmake:[0-9]+ \(include\)
  CMakeLists\.txt:[0-9]+ \(include\)

--- a/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-NEW-stderr.txt
+++ b/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-NEW-stderr.txt
@@ -3,9 +3,9 @@

 .*\/relative-output-NEW\.c

-  Tried extensions \.c \.C.*
-Call Stack \(most recent call first\):
+  Tried extensions ([^
+]+
+)+Call Stack \(most recent call first\):
  CMakeLists.txt:[0-9]+ \(include\)
-
-
+
 CMake Generate step failed.  Build files cannot be regenerated correctly.$
--- a/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-NEW.cmake
+++ b/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-NEW.cmake
@@ -1,5 +1,5 @@
 enable_language(C)
-add_library(foo)
+add_library(foo empty.c)

 cmake_policy(SET CMP0070 NEW)
 file(GENERATE OUTPUT relative-output-NEW.c CONTENT "")
--- a/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt
+++ b/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt
@@ -8,16 +8,15 @@
  behavior and not rely on setting a policy to OLD.
 Call Stack \(most recent call first\):
  CMakeLists.txt:[0-9]+ \(include\)
-
-
+
 CMake Error at SourceProperty-CMP0070-OLD.cmake:[0-9]+ \(target_sources\):
  Cannot find source file:

 .*\/relative-output-OLD\.c

-  Tried extensions \.c \.C.*
-Call Stack \(most recent call first\):
+  Tried extensions ([^
+]+
+)+Call Stack \(most recent call first\):
  CMakeLists.txt:[0-9]+ \(include\)
-
-
+
 CMake Generate step failed.  Build files cannot be regenerated correctly.$
--- a/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD.cmake
+++ b/Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD.cmake
@@ -1,5 +1,5 @@
 enable_language(C)
-add_library(foo)
+add_library(foo empty.c)

 cmake_policy(SET CMP0070 OLD)
 file(GENERATE OUTPUT relative-output-OLD.c CONTENT "")
--- a/Tests/RunCMake/InterfaceLibrary/global-interface-stderr.txt
+++ b/Tests/RunCMake/InterfaceLibrary/global-interface-stderr.txt
@@ -3,7 +3,7 @@ CMake Error at global-interface.cmake:2 \(add_library\):

    GLOBAL

-  Tried extensions \.c \.C .*
-.*
-Call Stack \(most recent call first\):
+  Tried extensions ([^
+]+
+)+Call Stack \(most recent call first\):
  CMakeLists.txt:3 \(include\)
--- a/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt
+++ b/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt
@@ -3,7 +3,7 @@ CMake Error at MissingSource.cmake:1 \(add_library\):

    missing.c

-  Tried extensions \.c \.C .*
-.*
-Call Stack \(most recent call first\):
+  Tried extensions ([^
+]+
+)+Call Stack \(most recent call first\):
  CMakeLists.txt:3 \(include\)
--- a/Tests/RunCMake/target_sources/FileSetDirect-stderr.txt
+++ b/Tests/RunCMake/target_sources/FileSetDirect-stderr.txt
@@ -3,9 +3,9 @@ CMake Error at FileSetDirect.cmake:3 \(add_library\):

    FILE_SET

-  Tried extensions .c .C .c\+\+ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .h
-  .hh .h\+\+ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc
-
+  Tried extensions ([^
+]+
+)+
  Hint: the FILE_SET keyword may only appear after a visibility specifier or
  another FILE_SET within the target_sources\(\) command.
 Call Stack \(most recent call first\):
--- a/Tests/RunCMake/target_sources/FileSetWrongSyntax-stderr.txt
+++ b/Tests/RunCMake/target_sources/FileSetWrongSyntax-stderr.txt
@@ -3,9 +3,9 @@ CMake Error at FileSetWrongSyntax.cmake:4 \(target_sources\):

    FILE_SET

-  Tried extensions .c .C .c\+\+ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .h
-  .hh .h\+\+ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc
-
+  Tried extensions ([^
+]+
+)+
  Hint: the FILE_SET keyword may only appear after a visibility specifier or
  another FILE_SET within the target_sources\(\) command.
 Call Stack \(most recent call first\):