anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix error in creating moc-files due to last commit.

Browse Source 
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:
Kornel Benko 2009-04-16 10:48:32 +00:00
parent 37d6ef964c
commit 517f8dc1d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/cmake/modules/LyXMacros.cmake
View File

@ -86,16 +86,16 @@ macro(LYX_AUTOMOC)
get_filename_component(_abs_PATH ${_abs_FILE} PATH) 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) if (_match)
foreach (_current_MOC_INC ${_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) get_filename_component(_basename ${_current_MOC} NAME_WE)
string(LENGTH ${_basename} _length) string(LENGTH ${_basename} _length)
MATH(EXPR _mocless_length ${_length}-4) 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) set(_header ${_abs_PATH}/${_mocless_name}.h)