Mercurial Mercurial > lua-lm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Detect lua interpreter presence for testing
authorMyhailo Danylenko <isbear@ukrpost.net>
Wed, 20 May 2009 19:48:34 +0300
changeset 26 1f7e8b53b255
parent 25 1ce483608721
child 27 23393a00c2c1
Detect lua interpreter presence for testing
CMakeLists.txt file | annotate | diff | comparison | revisions
README file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Wed May 20 00:15:21 2009 +0300
+++ b/CMakeLists.txt	Wed May 20 19:48:34 2009 +0300
@@ -54,6 +54,7 @@
 
 ## Gather information about system
 find_package(Lua51 REQUIRED)
+find_program(LUA_EXECUTABLE lua lua5.1 luanoreadline)
 execute_process(COMMAND lua -e "print ( package.path )" OUTPUT_VARIABLE LUA_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND lua -e "print ( package.cpath )" OUTPUT_VARIABLE LUA_CPATH OUTPUT_STRIP_TRAILING_WHITESPACE)
 find_package(PkgConfig REQUIRED)
@@ -77,7 +78,9 @@
 	add_custom_command(OUTPUT ${lua-lm_BINARY_DIR}/loudmouth.html COMMAND ${PERL_EXECUTABLE} ${lua-lm_SOURCE_DIR}/docgen.pl ${lua-lm_SOURCES} > ${lua-lm_BINARY_DIR}/loudmouth.html DEPENDS ${lua-lm_SOURCE_DIR}/docgen.pl ${lua-lm_SOURCES} WORKING_DIRECTORY ${lua-lm_SOURCE_DIR})
 	add_custom_target(doc ALL DEPENDS ${lua-lm_BINARY_DIR}/loudmouth.html)
 endif()
-add_custom_target(test COMMAND env "LUA_PATH=${lua-lm_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${lua-lm_SOURCE_DIR}/?.so;${lua-lm_BINARY_DIR}/?.so;${LUA_CPATH}" lua "${lua-lm_SOURCE_DIR}/test.lua" "${TEST_USER}" "${TEST_PASSWORD}" "${TEST_TO}" "${TEST_FINGERPRINT}" DEPENDS loudmouth VERBATIM)
+if(LUA_EXECUTABLE)
+	add_custom_target(test COMMAND env "LUA_PATH=${lua-lm_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${lua-lm_SOURCE_DIR}/?.so;${lua-lm_BINARY_DIR}/?.so;${LUA_CPATH}" "${LUA_EXECUTABLE}" "${lua-lm_SOURCE_DIR}/test.lua" "${TEST_USER}" "${TEST_PASSWORD}" "${TEST_TO}" "${TEST_FINGERPRINT}" DEPENDS loudmouth VERBATIM)
+endif()
 
 ## Set up installer
 install(TARGETS loudmouth DESTINATION lib/lua/5.1)
--- a/README	Wed May 20 00:15:21 2009 +0300
+++ b/README	Wed May 20 19:48:34 2009 +0300
@@ -4,7 +4,7 @@
 INSTALLATION
 
 To install it, you need:
-- lua (in fact, optional, to run test, but for now CMake cannot detect liblua separately)
+- lua (optional, to run test)
 - liblua headers and library
 - glib headers and library
 - loudmouth headers and library
@@ -24,7 +24,7 @@
 $ fakeroot make package
 # dpkg -i liblua5.1-*.deb
 
-Users of other systems can set other CPack generator wich cache editor.
+Users of other systems can set other CPack generator using cache editor.
 
 NOTES
 
@@ -35,6 +35,10 @@
 lm = require 'lm'
 i.e., you should assign require return value to some variable.
 
+Loudmouth uses glib main loop to work, thus you should use this module in
+a glib loop environment, provided either by your glib-based program or by some
+other module, eg lua binding for gtk+.
+
 LICENSE
 
 This code underlies terms of GNU GPL v2 or later. You can find it in file COPYING
lua-lm