mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix error in creating moc-files due to last commit.
Again: prepend moc_ instead of appending _moc in cmake git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29258 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
37d6ef964c
commit
517f8dc1d0
@ -86,16 +86,16 @@ macro(LYX_AUTOMOC)
|
||||
|
||||
get_filename_component(_abs_PATH ${_abs_FILE} PATH)
|
||||
|
||||
string(REGEX MATCHALL "#include +[^ ]+_moc\\.cpp[\">]" _match "${_contents}")
|
||||
string(REGEX MATCHALL "#include +[\"<]moc_[^ ]+\\.cpp[\">]" _match "${_contents}")
|
||||
if (_match)
|
||||
foreach (_current_MOC_INC ${_match})
|
||||
string(REGEX MATCH "[^ <\"]+_moc\\.cpp" _current_MOC "${_current_MOC_INC}")
|
||||
string(REGEX MATCH "moc_[^ <\"]+\\.cpp" _current_MOC "${_current_MOC_INC}")
|
||||
|
||||
get_filename_component(_basename ${_current_MOC} NAME_WE)
|
||||
|
||||
string(LENGTH ${_basename} _length)
|
||||
MATH(EXPR _mocless_length ${_length}-4)
|
||||
STRING(SUBSTRING ${_basename} 0 ${_mocless_length} _mocless_name)
|
||||
STRING(SUBSTRING ${_basename} 4 ${_mocless_length} _mocless_name )
|
||||
|
||||
set(_header ${_abs_PATH}/${_mocless_name}.h)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user