Skip to content

Commit eb2a3bc

Browse files
committed
Merge branch 'main' of github.com:stdware/qmsetup
2 parents 95c49d0 + 57ce7d2 commit eb2a3bc

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

cmake/QMSetupAPI.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function(qm_skip_automoc)
8686
get_filename_component(_item ${_item} ABSOLUTE)
8787

8888
if(IS_DIRECTORY ${_item})
89-
file(GLOB _src ${_item}/*.h ${_item}/*.hpp ${_item}/*.cpp ${_item}/*.cc ${_item}/*.mm)
89+
file(GLOB _src ${_item}/*.h ${_item}/*.hh ${_item}/*.hpp ${_item}/*.hxx ${_item}/*.c ${_item}/*.cc ${_item}/*.cpp ${_item}/*.cxx ${_item}/*.m ${_item}/*.mm)
9090
set_source_files_properties(
9191
${_src} PROPERTIES SKIP_AUTOMOC ON
9292
)

cmake/modules/Translate.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function(qm_add_translation _target)
5353
# Collect source directories
5454
if(FUNC_DIRECTORIES)
5555
foreach(_item ${FUNC_DIRECTORIES})
56-
file(GLOB _tmp ${_item}/*.h ${_item}/*.hpp ${_item}/*.cpp ${_item}/*.cc ${_item}/*.mm)
56+
file(GLOB _tmp ${_item}/*.h ${_item}/*.hh ${_item}/*.hpp ${_item}/*.hxx ${_item}/*.c ${_item}/*.cc ${_item}/*.cpp ${_item}/*.cxx ${_item}/*.m ${_item}/*.mm)
5757
list(APPEND _src_files ${_tmp})
5858
endforeach()
5959
endif()
@@ -69,7 +69,7 @@ function(qm_add_translation _target)
6969

7070
set(_tmp_files)
7171
get_target_property(_tmp_files ${_item} SOURCES)
72-
list(FILTER _tmp_files INCLUDE REGEX ".+\\.(cpp|cc)")
72+
list(FILTER _tmp_files INCLUDE REGEX ".+\\.(h|hh|hpp|hxx|c|cc|cpp|cxx|m|mm)")
7373
list(FILTER _tmp_files EXCLUDE REGEX "(qasc|moc)_.+")
7474

7575
# Need to convert to absolute path

0 commit comments

Comments
 (0)