--- a/CMakeLists.txt Tue Nov 27 12:12:57 2012 +0200
+++ b/CMakeLists.txt Wed Nov 28 04:27:33 2012 +0200
@@ -16,18 +16,29 @@
cmake_minimum_required(VERSION 2.6)
project(lua C)
-set(PROJECT_VERSION "0.0.1")
+set(PROJECT_VERSION "0.0.2")
## User options
-option(DEBUG "Enable debugging output" ON)
-option(LLM_CONNECTION_ENABLE "Enable exposing of mcabber loudmouth connection to lua" ON)
-option(LLM_LOG_HANDLER "Enable registration of log messages handler for lua-loudmouth library's messages" ON)
+option(DEBUG "Enable debugging output" ON)
+option(WANT_LUA52 "Use lua 5.2 instead of 5.1" OFF)
+option(LLM_CONNECTION_ENABLE "Enable exposing of mcabber loudmouth connection to lua" ON)
+option(LLM_LOG_HANDLER "Enable registration of log messages handler for lua-loudmouth library's messages" ON)
set(ML_SOURCE_PRIORITY G_PRIORITY_HIGH_IDLE CACHE STRING "Glib event source priority for timeout and bgread")
-set(ML_BGREAD_BUFFER 4096 CACHE STRING "Background pipe reading buffer size")
+set(ML_BGREAD_BUFFER 4096 CACHE STRING "Background pipe reading buffer size")
## Gather information about system
-find_package(Lua51 REQUIRED)
find_package(PkgConfig REQUIRED)
+if(NOT WANT_LUA52)
+ find_package(Lua51)
+endif()
+if(WANT_LUA52 OR NOT LUA51_FOUND)
+ pkg_check_modules(LUA REQUIRED lua5.2)
+ set(LUA_VERSION "5.2")
+ set(HAVE_LUA52 "1")
+else()
+ set(LUA_VERSION "5.1")
+ set(LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+endif()
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
pkg_check_modules(MCABBER REQUIRED mcabber)
@@ -53,7 +64,7 @@
## Set up compiler
configure_file(config.h.in config.h ESCAPE_QUOTES)
-include_directories(SYSTEM ${LUA_INCLUDE_DIR}
+include_directories(SYSTEM ${LUA_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GMODULE_INCLUDE_DIRS}
${MCABBER_INCLUDE_DIRS})
@@ -67,38 +78,38 @@
## Extra targets
if(DOCGEN_EXECUTABLE)
- add_custom_command(OUTPUT ${lua_BINARY_DIR}/lua.html COMMAND ${DOCGEN_EXECUTABLE} -f html -t "Documentation for Lua module for MCabber" -o ${lua_BINARY_DIR}/lua.html -- ${lua_SOURCES} DEPENDS ${DOCGEN_EXECUTABLE} ${lua_SOURCES} WORKING_DIRECTORY ${lua_SOURCE_DIR})
- add_custom_target(doc ALL DEPENDS ${lua_BINARY_DIR}/lua.html)
+ add_custom_command(OUTPUT ${lua_BINARY_DIR}/lua.html COMMAND ${DOCGEN_EXECUTABLE} -f html -t "Documentation for Lua module for MCabber" -o ${lua_BINARY_DIR}/lua.html -- ${lua_SOURCES} DEPENDS ${DOCGEN_EXECUTABLE} ${lua_SOURCES} WORKING_DIRECTORY ${lua_SOURCE_DIR})
+ add_custom_target(doc ALL DEPENDS ${lua_BINARY_DIR}/lua.html)
add_custom_command(OUTPUT ${lua_SOURCE_DIR}/docs/api.mdwn COMMAND ${DOCGEN_EXECUTABLE} -f mdwn -t "Documentation for Lua module for MCabber" -o ${lua_SOURCE_DIR}/docs/api.mdwn -- ${lua_SOURCES} DEPENDS ${DOCGEN_EXECUTABLE} ${lua_SOURCES} WORKING_DIRECTORY ${lua_SOURCE_DIR})
add_custom_target(update_api DEPENDS ${lua_SOURCE_DIR}/docs/api.mdwn)
endif()
## Packaging information
-set(CPACK_PACKAGE_NAME libmcabber-lua)
-set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-set(CPACK_PACKAGE_VENDOR "IsBear")
-set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
+set(CPACK_PACKAGE_NAME libmcabber-lua)
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+set(CPACK_PACKAGE_VENDOR "IsBear")
+set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber lua module")
-set(CPACK_PACKAGE_DESCRIPTION_FILE ${lua_SOURCE_DIR}/README)
-set(CPACK_RESOURCE_FILE_LICENSE ${lua_SOURCE_DIR}/COPYING)
-set(CPACK_RESOURCE_FILE_README ${lua_SOURCE_DIR}/README)
-set(CPACK_RESOURCE_FILE_WELCOME ${lua_SOURCE_DIR}/README)
+set(CPACK_PACKAGE_DESCRIPTION_FILE ${lua_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_LICENSE ${lua_SOURCE_DIR}/COPYING)
+set(CPACK_RESOURCE_FILE_README ${lua_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_WELCOME ${lua_SOURCE_DIR}/README)
set(CPACK_SOURCE_GENERATOR TBZ2)
-set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
+set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
# XXX
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, liblua5.1-0, libglib2.0-0")
-set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "mcabber-lm | mcabber")
-set(CPACK_DEBIAN_PACKAGE_SUGGESTS "liblua5.1-posix1, liblua5.1-base64-0, liblua5.1-sha1-0")
-set(CPACK_DEBIAN_PACKAGE_SECTION libs)
-find_program(DPKG_EXECUTABLE dpkg)
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, liblua${LUA_VERSION}-0, libglib2.0-0")
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "mcabber")
+set(CPACK_DEBIAN_PACKAGE_SUGGESTS "lua${LUA_VERSION}-posix, lua${LUA_VERSION}-base64, lua${LUA_VERSION}-sha1")
+set(CPACK_DEBIAN_PACKAGE_SECTION libs)
+find_program(DPKG_EXECUTABLE dpkg DOC "Path to dpkg (optional, to detect architecture)")
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 STRING "Architecture of package")
endif()
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
# XXX: Set package name directly to get rid of -Sources?
-set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
+set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
include(CPack)
if(HAVE_MCABBER_COMPLETION_FLAGS)
@@ -109,13 +120,13 @@
configure_file(lua.avv.in lua.avv)
## Set up installer
-install(TARGETS lua DESTINATION lib/mcabber)
+install(TARGETS lua DESTINATION lib/mcabber)
if(DOCGEN_EXECUTABLE)
- install(FILES ${lua_BINARY_DIR}/lua.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+ install(FILES ${lua_BINARY_DIR}/lua.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
endif()
-install(DIRECTORY examples DESTINATION share/doc/${CPACK_PACKAGE_NAME} PATTERN "*~" EXCLUDE)
-install(FILES docs/readme.mdwn docs/todo.mdwn COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME})
-install(DIRECTORY help DESTINATION share/mcabber)
-install(FILES ${PROJECT_BINARY_DIR}/lua.avv DESTINATION share/mcabber/avv/modules RENAME lua)
+install(DIRECTORY examples DESTINATION share/doc/${CPACK_PACKAGE_NAME} PATTERN "*~" EXCLUDE)
+install(FILES docs/readme.mdwn docs/todo.mdwn COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+install(DIRECTORY help DESTINATION share/mcabber)
+install(FILES ${PROJECT_BINARY_DIR}/lua.avv DESTINATION share/mcabber/avv/modules RENAME lua)
## The End ## vim: se ts=4 sw=4: ##