summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Drahos <drahosp@gmail.com>2011-03-15 21:43:35 +0100
committerPeter Drahos <drahosp@gmail.com>2011-03-15 21:43:35 +0100
commit33be30b7455b61c0dcbd7bea3a02791aa722fbb7 (patch)
tree9865f53cfe2bff0ba92bc6f6770c1c6a8c146a7d
parente654d5428a2c5d978b0ba50ce8c512e2fc3c3cd4 (diff)
downloadlua-33be30b7455b61c0dcbd7bea3a02791aa722fbb7.tar.gz
Tested on Linux and Cygwin
-rw-r--r--CMakeLists.txt4
-rw-r--r--README2
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9abe112..e05b0bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ if ( WIN32 AND NOT CYGWIN )
set ( LUA_PATH_DEFAULT ".\\?.lua;${LUA_LDIR}?.lua;${LUA_LDIR}?\\init.lua;${LUA_CDIR}?.lua;${LUA_CDIR}?\\init.lua" )
set ( LUA_CPATH_DEFAULT ".\\?${CMAKE_SHARED_MODULE_SUFFIX};${LUA_CDIR}?${CMAKE_SHARED_MODULE_SUFFIX};${LUA_CDIR}loadall${CMAKE_SHARED_MODULE_SUFFIX}" )
else ()
- # Posix systems
+ # Posix systems (incl. Cygwin)
option ( LUA_USE_POSIX "Use POSIX functionality." ON )
option ( LUA_USE_DLOPEN "Use dynamic linker to load modules." ON )
option ( LUA_USE_MKSTEMP "Use mkstep." ON )
@@ -136,6 +136,8 @@ install ( DIRECTORY doc etc test DESTINATION ${INSTALL_DATA} )
install ( FILES README COPYRIGHT HISTORY DESTINATION ${INSTALL_DATA} )
## TESTS
+set(LUA lua)
+
add_lua_test ( test/bisect.lua )
add_lua_test ( test/cf.lua )
add_lua_test ( test/echo.lua )
diff --git a/README b/README
index 88fc88a..b028e7d 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ See HISTORY for a summary of changes since the last released version.
In the LuaDist distribution the default makefiles have been replaced with
CMake. To build Lua use the following approach.
> mkdir _build && cd_build
- > ccmake .. # Set up configuration
+ > ccmake .. # Set up configuration, alternatively use cmake-gui on Windows.
> cmake --build . --target install
The default makefile should work too, you just need to edit src/luaconf.h.orig