diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-19 00:54:55 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-19 00:59:07 +0100 |
| commit | 7dd1561a883a28ffa275e1a097bd82853b4cc6f8 (patch) | |
| tree | d73e7b0709f3ed12c98c26cc7399aee0b06c4ebf /lib/lua/CMakeLists.txt | |
| parent | Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux (diff) | |
| download | cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.tar cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.tar.gz cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.tar.bz2 cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.tar.lz cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.tar.xz cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.tar.zst cuberite-7dd1561a883a28ffa275e1a097bd82853b4cc6f8.zip | |
Diffstat (limited to 'lib/lua/CMakeLists.txt')
| -rw-r--r-- | lib/lua/CMakeLists.txt | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt index 526be7a46..2fc194874 100644 --- a/lib/lua/CMakeLists.txt +++ b/lib/lua/CMakeLists.txt @@ -5,25 +5,8 @@ project (lua) include_directories ("${PROJECT_SOURCE_DIR}/../../src/") file(GLOB SOURCE - "*.c" + "src/*.c" ) -list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/lua.c") +add_library(lua ${SOURCE}) -if ((${CMAKE_GENERATOR} MATCHES "Unix Makefiles") AND (NOT LUA_CMAKE_BUILD)) - if(NOT ${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR}) - message(WARNING "lua does not support prefix when using the makefile") - endif() - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lua - COMMAND "make" - DEPENDS ${SOURCE} - ) - - -else() - message("generator [${CMAKE_GENERATOR}] does not match Unix Makefiles so manually compiling lua") - - add_library(lua ${SOURCE}) - -endif() |