Merge branch 'main' of github.com:stdware/qmsetup

stdware · Jan 31, 2024 · eb2a3bc · eb2a3bc
2 parents 95c49d0 + 57ce7d2
commit eb2a3bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmake/QMSetupAPI.cmake b/cmake/QMSetupAPI.cmake
@@ -86,7 +86,7 @@ function(qm_skip_automoc)
         get_filename_component(_item ${_item} ABSOLUTE)
 
         if(IS_DIRECTORY ${_item})
-            file(GLOB _src ${_item}/*.h ${_item}/*.hpp ${_item}/*.cpp ${_item}/*.cc ${_item}/*.mm)
+            file(GLOB _src ${_item}/*.h ${_item}/*.hh ${_item}/*.hpp ${_item}/*.hxx ${_item}/*.c ${_item}/*.cc ${_item}/*.cpp ${_item}/*.cxx ${_item}/*.m ${_item}/*.mm)
             set_source_files_properties(
                 ${_src} PROPERTIES SKIP_AUTOMOC ON
             )

diff --git a/cmake/modules/Translate.cmake b/cmake/modules/Translate.cmake
@@ -53,7 +53,7 @@ function(qm_add_translation _target)
     # Collect source directories
     if(FUNC_DIRECTORIES)
         foreach(_item ${FUNC_DIRECTORIES})
-            file(GLOB _tmp ${_item}/*.h ${_item}/*.hpp ${_item}/*.cpp ${_item}/*.cc ${_item}/*.mm)
+            file(GLOB _tmp ${_item}/*.h ${_item}/*.hh ${_item}/*.hpp ${_item}/*.hxx ${_item}/*.c ${_item}/*.cc ${_item}/*.cpp ${_item}/*.cxx ${_item}/*.m ${_item}/*.mm)
             list(APPEND _src_files ${_tmp})
         endforeach()
     endif()
@@ -69,7 +69,7 @@ function(qm_add_translation _target)
 
             set(_tmp_files)
             get_target_property(_tmp_files ${_item} SOURCES)
-            list(FILTER _tmp_files INCLUDE REGEX ".+\\.(cpp|cc)")
+            list(FILTER _tmp_files INCLUDE REGEX ".+\\.(h|hh|hpp|hxx|c|cc|cpp|cxx|m|mm)")
             list(FILTER _tmp_files EXCLUDE REGEX "(qasc|moc)_.+")
 
             # Need to convert to absolute path