Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake: fix path to tolua executable.

This commit is contained in:
Enno Rehling 2013-12-28 15:13:22 -08:00
parent 0aa4272d42
commit 8c981b76cc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -21,11 +21,11 @@ ELSE(CMAKE_COMPILER_IS_GNUCC)
MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}") MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
ENDIF(CMAKE_COMPILER_IS_GNUCC) ENDIF(CMAKE_COMPILER_IS_GNUCC)
find_package (Lua 5 REQUIRED)
find_package (ToLua REQUIRED)
find_package (LibXml2 REQUIRED) find_package (LibXml2 REQUIRED)
find_package (Curses REQUIRED)
find_package (SQLite3 REQUIRED) find_package (SQLite3 REQUIRED)
find_package (Curses REQUIRED)
find_package (Lua REQUIRED)
find_package (ToLua REQUIRED)
add_subdirectory (src server) add_subdirectory (src server)
add_subdirectory (crypto) add_subdirectory (crypto)

2
cmake

@ -1 +1 @@
Subproject commit 92b721b05086d95d7d87112d740f3bd80d9dc9e6 Subproject commit 31a00838133b93d4954517441898dceec527e303

3
core/src/bindings/CMakeLists.txt
View File

@ -3,6 +3,7 @@ project (bindings C)
IF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long")
ELSEIF(MSVC)
ELSE(CMAKE_COMPILER_IS_GNUCC) ELSE(CMAKE_COMPILER_IS_GNUCC)
MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}") MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
ENDIF(CMAKE_COMPILER_IS_GNUCC) ENDIF(CMAKE_COMPILER_IS_GNUCC)
@ -36,7 +37,7 @@ MACRO(TOLUA_BINDING PKGFILE FILES)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${PKGFILE}.c OUTPUT ${PKGFILE}.c
DEPENDS ${FILES} ${PKGFILE} DEPENDS ${FILES} ${PKGFILE}
COMMAND tolua COMMAND ${TOLUA_EXECUTABLE}
ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/${PKGFILE}.c ${PKGFILE} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/${PKGFILE}.c ${PKGFILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )