diff options
author | Alexey Edelev <semlanik@gmail.com> | 2019-11-25 11:59:48 +0100 |
---|---|---|
committer | Alexey Edelev <semlanik@gmail.com> | 2019-11-27 09:58:28 +0100 |
commit | 89bd5a7e733a64b694abf16b8d227dbbdd2d3ef7 (patch) | |
tree | c2526f372db1a704a6a01461d98034091353b357 /src/corelib | |
parent | a5a37a752937f4e17619293a5b2ca939ebf5ab9d (diff) |
Replace get_filename_component usage with REGEX_REPLACE
Replace get_filename_component usage with custom string
REGEX_REPLACE to avoid cutting non-ending suffices while
moc generation
Fixes: QTBUG-80295
Change-Id: I8cdb729370c6d884f6638d172ee523fdc2df5404
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 3a60b8e0d2..7735e51012 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -59,7 +59,7 @@ macro(QT5_MAKE_OUTPUT_FILE infile prefix ext outfile ) set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}") string(REPLACE ".." "__" _outfile ${_outfile}) get_filename_component(outpath ${_outfile} PATH) - get_filename_component(_outfile ${_outfile} NAME_WE) + string(REGEX REPLACE "\\.[^.]*$" "" _outfile ${_outfile}) file(MAKE_DIRECTORY ${outpath}) set(${outfile} ${outpath}/${prefix}${_outfile}.${ext}) endmacro() |