anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix indentation

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21108 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-10-21 22:23:19 +00:00
parent 9ec9f70df5
commit e6bb7dc281
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,12 +28,12 @@
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
macro(lyx_add_path _list _prefix) macro(lyx_add_path _list _prefix)
set(_tmp) set(_tmp)
foreach(_current ${${_list}}) foreach(_current ${${_list}})
set(_tmp ${_tmp} ${_prefix}/${_current}) set(_tmp ${_tmp} ${_prefix}/${_current})
#message( ${_prefix}/${_current}) #message( ${_prefix}/${_current})
endforeach(_current) endforeach(_current)
set(${_list} ${_tmp}) set(${_list} ${_tmp})
endmacro(lyx_add_path _out _prefix) endmacro(lyx_add_path _out _prefix)
@ -96,30 +96,27 @@ macro(LYX_AUTOMOC)
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)
MATH(EXPR _mocless_length ${_length}-4)
STRING(SUBSTRING ${_basename} 0 ${_mocless_length} _mocless_name )
set(_header ${_abs_PATH}/${_mocless_name}.h)
#message(STATUS "moc : ${_header}")
#set(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h) string(LENGTH ${_basename} _length)
#set(_header ${_abs_PATH}/${_basename}.h) MATH(EXPR _mocless_length ${_length}-4)
set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) STRING(SUBSTRING ${_basename} 0 ${_mocless_length} _mocless_name )
set(_header ${_abs_PATH}/${_mocless_name}.h)
#message(STATUS "moc : ${_header}")
#set(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
#set(_header ${_abs_PATH}/${_basename}.h)
#set(_moc ${_abs_PATH}/${_current_MOC}) set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
add_custom_command(OUTPUT ${_moc} #set(_moc ${_abs_PATH}/${_current_MOC})
COMMAND ${QT_MOC_EXECUTABLE} add_custom_command(OUTPUT ${_moc}
ARGS ${_moc_INCS} ${_header} -o ${_moc} COMMAND ${QT_MOC_EXECUTABLE}
MAIN_DEPENDENCY ${_header} ARGS ${_moc_INCS} ${_header} -o ${_moc}
) MAIN_DEPENDENCY ${_header})
macro_add_file_dependencies(${_abs_FILE} ${_moc}) macro_add_file_dependencies(${_abs_FILE} ${_moc})
endforeach (_current_MOC_INC) endforeach (_current_MOC_INC)
else() else()
#message(STATUS "moc not found : ${_abs_FILE} ") #message(STATUS "moc not found : ${_abs_FILE} ")
endif() endif()
endif() endif()