mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
cmake: fix indentation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21108 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
9ec9f70df5
commit
e6bb7dc281
@ -28,12 +28,12 @@
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
||||
|
||||
macro(lyx_add_path _list _prefix)
|
||||
set(_tmp)
|
||||
foreach(_current ${${_list}})
|
||||
set(_tmp ${_tmp} ${_prefix}/${_current})
|
||||
#message( ${_prefix}/${_current})
|
||||
endforeach(_current)
|
||||
set(${_list} ${_tmp})
|
||||
set(_tmp)
|
||||
foreach(_current ${${_list}})
|
||||
set(_tmp ${_tmp} ${_prefix}/${_current})
|
||||
#message( ${_prefix}/${_current})
|
||||
endforeach(_current)
|
||||
set(${_list} ${_tmp})
|
||||
endmacro(lyx_add_path _out _prefix)
|
||||
|
||||
|
||||
@ -96,30 +96,27 @@ macro(LYX_AUTOMOC)
|
||||
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 )
|
||||
|
||||
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 ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
|
||||
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)
|
||||
#set(_header ${_abs_PATH}/${_basename}.h)
|
||||
|
||||
#set(_moc ${_abs_PATH}/${_current_MOC})
|
||||
add_custom_command(OUTPUT ${_moc}
|
||||
COMMAND ${QT_MOC_EXECUTABLE}
|
||||
ARGS ${_moc_INCS} ${_header} -o ${_moc}
|
||||
MAIN_DEPENDENCY ${_header}
|
||||
)
|
||||
set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
|
||||
#set(_moc ${_abs_PATH}/${_current_MOC})
|
||||
add_custom_command(OUTPUT ${_moc}
|
||||
COMMAND ${QT_MOC_EXECUTABLE}
|
||||
ARGS ${_moc_INCS} ${_header} -o ${_moc}
|
||||
MAIN_DEPENDENCY ${_header})
|
||||
macro_add_file_dependencies(${_abs_FILE} ${_moc})
|
||||
|
||||
endforeach (_current_MOC_INC)
|
||||
else()
|
||||
#message(STATUS "moc not found : ${_abs_FILE} ")
|
||||
#message(STATUS "moc not found : ${_abs_FILE} ")
|
||||
endif()
|
||||
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user