cmake: indent

This commit is contained in:
Michael Gehring 2008-06-23 13:57:30 +02:00 committed by Julien Danjou
parent d08f746733
commit 8f5363bcc1
2 changed files with 58 additions and 49 deletions

View File

@ -10,7 +10,8 @@ endif()
include(awesomeConfig.cmake)
include_directories(${SOURCE_DIR}
include_directories(
${SOURCE_DIR}
${BUILD_DIR}
${AWESOME_REQUIRED_INCLUDE_DIRS}
${AWESOME_OPTIONAL_INCLUDE_DIRS})
@ -174,7 +175,8 @@ if(GENERATE_MANPAGES)
macro(a_file_match infile regex result_var)
if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
# cmake < 2.6 doesn't know FILE(STRINGS ...)
execute_process(COMMAND ${GREP_EXECUTABLE} -l ${regex} ${infile}
execute_process(
COMMAND ${GREP_EXECUTABLE} -l ${regex} ${infile}
RESULT_VARIABLE exit_code
OUTPUT_QUIET)
if(exit_code EQUAL 0)
@ -201,7 +203,8 @@ if(GENERATE_MANPAGES)
endforeach()
# luadoc target
add_custom_command(COMMAND ${CAT_EXECUTABLE} ${LUA_APIDOC_SRCS}
add_custom_command(
COMMAND ${CAT_EXECUTABLE} ${LUA_APIDOC_SRCS}
| ${LUA_EXECUTABLE} ${SOURCE_DIR}/build-utils/gendoc.lua
> ${LUADOC_FILE}
OUTPUT ${LUADOC_FILE}
@ -222,16 +225,19 @@ if(GENERATE_MANPAGES)
# TODO: This is still not 100% right. Actually only
# awesomerc.5.xml should depend on ${LUADOC_FILE}.
add_custom_command(COMMAND ${CAT_EXECUTABLE} ${txtfile}
add_custom_command(
COMMAND ${CAT_EXECUTABLE} ${txtfile}
| ${ASCIIDOC_EXECUTABLE} -d manpage -b docbook -o ${xmlfile} -
WORKING_DIRECTORY ${BUILD_DIR}
OUTPUT ${xmlfile}
DEPENDS ${txtfile} ${LUADOC_FILE}
VERBATIM)
add_custom_command(COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile}
add_custom_command(
COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile}
OUTPUT ${manfile}
DEPENDS ${xmlfile})
add_custom_command(COMMAND ${CAT_EXECUTABLE} ${manfile}
add_custom_command(
COMMAND ${CAT_EXECUTABLE} ${manfile}
| ${GZIP_EXECUTABLE}
> ${gzfile}
OUTPUT ${gzfile}

View File

@ -64,7 +64,8 @@ endif()
if(EXISTS ${SOURCE_DIR}/.git/HEAD)
if(GIT_EXECUTABLE)
# get current version
execute_process(COMMAND ${GIT_EXECUTABLE} describe
execute_process(
COMMAND ${GIT_EXECUTABLE} describe
WORKING_DIRECTORY ${SOURCE_DIR}
OUTPUT_VARIABLE VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
@ -136,7 +137,8 @@ set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES}
${LIB_EV}
${LUA_LIB})
set(AWESOME_REQUIRED_INCLUDE_DIRS ${AWESOME_REQUIRED_INCLUDE_DIRS} ${LUA_INC_DIR})
set(AWESOME_REQUIRED_INCLUDE_DIRS ${AWESOME_REQUIRED_INCLUDE_DIRS}
${LUA_INC_DIR})
# }}}
# {{{ Optional libraries.
@ -191,7 +193,8 @@ set(AWESOME_REL_DOC_PATH ${AWESOME_SHARE}/doc/${PROJECT_AWE_NAME})
# }}}
# {{{ Configure files.
set (AWESOME_CONFIGURE_FILES config.h.in
set(AWESOME_CONFIGURE_FILES
config.h.in
awesomerc.lua.in
awesome-version-internal.h.in
awesome.doxygen.in)