Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 20:31:17 +00:00
Code Issues Releases Activity

More work on CMake build system (possibly finished?).

Browse Source
This commit is contained in:
Brenden Matthews 2009-12-19 11:39:16 -08:00
parent fb33419cd4
commit 4d0924f6b0
4 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Conky.cmake
View File

@ -75,12 +75,7 @@ if(NOT RELEASE)
mark_as_advanced(APP_GIT) mark_as_advanced(APP_GIT)
endif(NOT RELEASE) endif(NOT RELEASE)
# Used for doc generation mark_as_advanced(APP_GAWK APP_WC APP_DATE APP_UNAME)
find_program(APP_DB2X_XSLTPROC db2x_xsltproc)
find_program(APP_DB2X_MANXML db2x_manxml)
find_program(APP_XSLTPROC xsltproc)
mark_as_advanced(APP_GAWK APP_WC APP_DATE APP_UNAME APP_DB2X_XSLTPROC APP_DB2X_MANXML APP_XSLTPROC)
# The version numbers are simply derived from the date and number of commits # The version numbers are simply derived from the date and number of commits
# since start of month # since start of month

14
cmake/ConkyBuildOptions.cmake
View File

@ -1,9 +1,15 @@
# vim: ts=4 sw=4 noet ai cindent syntax=cmake # vim: ts=4 sw=4 noet ai cindent syntax=cmake
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING if(MAINTAINER_MODE)
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." set(CMAKE_BUILD_TYPE Debug CACHE STRING
FORCE) "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE)
else(MAINTAINER_MODE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE)
endif(MAINTAINER_MODE)
endif(NOT CMAKE_BUILD_TYPE) endif(NOT CMAKE_BUILD_TYPE)
# -std options for all build types # -std options for all build types
@ -22,6 +28,8 @@ endif(CMAKE_BUILD_TYPE MATCHES "Debug")
option(RELEASE "Build release package" false) option(RELEASE "Build release package" false)
mark_as_advanced(RELEASE) mark_as_advanced(RELEASE)
option(MAINTAINER_MODE "Enable maintainer mode (builds docs)" false)
# Some standard options # Some standard options
set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf" CACHE STRING "Default system-wide Conky configuration file") set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf" CACHE STRING "Default system-wide Conky configuration file")
# use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is modified # use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is modified

31
cmake/ConkyPlatformChecks.cmake
View File

@ -268,5 +268,36 @@ if(WANT_TOLUA)
else(TOLUA_INCLUDE_PATH AND TOLUA_LIBS) else(TOLUA_INCLUDE_PATH AND TOLUA_LIBS)
message(FATAL_ERROR "Unable to find tolua++ library") message(FATAL_ERROR "Unable to find tolua++ library")
endif(TOLUA_INCLUDE_PATH AND TOLUA_LIBS) endif(TOLUA_INCLUDE_PATH AND TOLUA_LIBS)
mark_as_advanced(APP_TOLUA TOLUA_INCLUDE_PATH TOLUA_LIBS)
endif(WANT_TOLUA) endif(WANT_TOLUA)
# Look for doc generation programs
if(MAINTAINER_MODE)
# Used for doc generation
find_program(APP_DB2X_XSLTPROC db2x_xsltproc)
if(NOT APP_DB2X_XSLTPROC)
message(FATAL_ERROR "Unable to find program 'db2x_xsltproc'")
endif(NOT APP_DB2X_XSLTPROC)
find_program(APP_DB2X_MANXML db2x_manxml)
if(NOT APP_DB2X_MANXML)
message(FATAL_ERROR "Unable to find program 'db2x_manxml'")
endif(NOT APP_DB2X_MANXML)
find_program(APP_XSLTPROC xsltproc)
if(NOT APP_XSLTPROC)
message(FATAL_ERROR "Unable to find program 'xsltproc'")
endif(NOT APP_XSLTPROC)
find_program(APP_MAN man)
if(NOT APP_MAN)
message(FATAL_ERROR "Unable to find program 'man'")
endif(NOT APP_MAN)
find_program(APP_LESS less)
if(NOT APP_LESS)
message(FATAL_ERROR "Unable to find program 'less'")
endif(NOT APP_LESS)
find_program(APP_SED sed)
if(NOT APP_SED)
message(FATAL_ERROR "Unable to find program 'sed'")
endif(NOT APP_SED)
mark_as_advanced(APP_DB2X_XSLTPROC APP_DB2X_MANXML APP_XSLTPROC APP_MAN)
endif(MAINTAINER_MODE)

6
doc/CMakeLists.txt
View File

@ -0,0 +1,6 @@
include(Docbook)
if(MAINTAINER_MODE)
wrap_xsltproc(lua config_settings variables)
wrap_man(docs)
endif(MAINTAINER_MODE)