diff -r 5052c1200b68 -r 5b818c7467ad CMakeLists.txt --- a/CMakeLists.txt Sun Feb 10 19:01:35 2013 +0200 +++ b/CMakeLists.txt Sun Feb 10 19:25:41 2013 +0200 @@ -19,7 +19,11 @@ set(PROJECT_VERSION "0.0.1") ## User settable options - +set(OPT_CMD_HEADER "cmd_header" CACHE STRING "Name for mcabber option to enable/disable header with command line") +set(OPT_CMD_HEADER_INLINE "cmd_header_inline" CACHE STRING "Name for mcabber option to switch between headline/inline header") +set(OPT_CMD_REDIRECT_STDERR "cmd_redirect_stderr" CACHE STRING "Name for mcabber option to enable stderr capturing") +set(OPT_CMD_SHELL "cmd_shell" CACHE STRING "Name for mcabber option to specify shell to be used to execute command") + ## Check for build dependencies find_package(PkgConfig REQUIRED) pkg_check_modules(GLIB REQUIRED glib-2.0) @@ -41,20 +45,20 @@ set_target_properties(cmd PROPERTIES COMPILE_FLAGS "-Wall") ## Packaging information -set(CPACK_PACKAGE_NAME libmcabber-cmd) +set(CPACK_PACKAGE_NAME mcabber-mod-cmd) set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_VENDOR "IsBear") set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko ") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for sending shell commands output to others") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for sending shell command output to buddies") set(CPACK_RESOURCE_FILE_LICENSE ${cmd_SOURCE_DIR}/COPYING) set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...") +set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...") set(CPACK_DEBIAN_PACKAGE_SECTION libs) find_program(DPKG_EXECUTABLE dpkg) if(DPKG_EXECUTABLE) execute_process(COMMAND ${DPKG_EXECUTABLE} --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) else() - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE TEXT "Architecture of package") + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE STRING "Architecture of package") endif() set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")