From e0107429d355df25a317dc69bd059eba722657c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20C=2E=20Morency?= Date: Thu, 19 Jun 2008 16:09:36 -0700 Subject: [PATCH] * Fixed man page generation Signed-off-by: Julien Danjou --- CMakeLists.txt | 7 ++++--- awesomeConfig.cmake | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1ef0036d..d15db6bb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,11 +84,13 @@ SET( AWE_MAN5_NAME ${CMAKE_CURRENT_BINARY_DIR}/awesomerc.5.gz ) SET( AWE_LUADOC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/apidocgen.txt ) + ADD_EXECUTABLE( ${PROJECT_AWE_NAME} ${AWE_SRCS} ) ADD_EXECUTABLE( ${PROJECT_AWECLIENT_NAME} ${AWE_CLIENT_SRCS} ) TARGET_LINK_LIBRARIES( ${PROJECT_AWE_NAME} ${AWE_MOD_LIBRARIES} ${LUA_LIB} + ${LIB_EV} ${LIB_READLINE} ${LIB_NCURSES} ${LIB_EV} @@ -117,9 +119,8 @@ IF( AWESOME_GENERATE_MAN ) ADD_CUSTOM_COMMAND( TARGET ${PROJECT_AWECLIENT_NAME} POST_BUILD COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b docbook -o ${xmlfile} ${txtfile} COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile} - COMMAND ${GZIP_EXECUTABLE} -f ${manfile} - COMMENT "Generating man pages for ${manfile}" - VERBATIM + COMMAND ${GZIP_EXECUTABLE} -f ${manfile} + COMMENT "Generating manpage for ${manfile}" ) ENDFOREACH( txtfile ) ENDIF( AWESOME_GENERATE_MAN ) diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index 0686637ea..1cd7c7085 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -58,6 +58,7 @@ pkg_check_modules( AWE_MOD REQUIRED glib-2.0 # Check for readline and ncurse FIND_LIBRARY( LIB_READLINE readline ) FIND_LIBRARY( LIB_NCURSES ncurses ) +FIND_LIBRARY( LIB_EV ev ) # Check for lobev FIND_LIBRARY( LIB_EV ev ) @@ -78,6 +79,10 @@ FIND_LIBRARY(LUA_LIB NAMES lua5.1 lua FIND_PROGRAM( LUA_EXECUTABLE lua ) # Error check +IF( NOT LIB_EV ) + MESSAGE( FATAL_ERROR "ev library not found" ) +ENDIF( NOT LIB_EV ) + IF( NOT LIB_READLINE ) MESSAGE( FATAL_ERROR "readline library not found" ) ENDIF( NOT LIB_READLINE )