Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: stop compiling Lua libs 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-09-05 20:38:25 +02:00
parent edfee160ea
commit 68cff957be
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -305,27 +305,6 @@ if(GENERATE_LUADOC)
endif() endif()
# }}} # }}}
# {{{ Compile Lua libs
if(LUAC_EXECUTABLE)
foreach(luafile ${AWE_LUA_FILES})
string(REGEX REPLACE ".lua\$" ".luac" luacfile ${luafile})
add_custom_command(
COMMAND ${LUAC_EXECUTABLE} -o ${luacfile} ${luafile}
OUTPUT ${luacfile}
DEPENDS ${luafile})
set(AWE_LUAC_FILES ${AWE_LUAC_FILES} ${luacfile})
endforeach()
if(NOT EXISTS ${BUILD_DIR}/lib)
FILE(MAKE_DIRECTORY ${BUILD_DIR}/lib)
endif()
add_custom_target(compile_lua ALL DEPENDS ${AWE_LUAC_FILES})
endif()
# }}}
# {{{ Dist tarball # {{{ Dist tarball
if(BUILD_FROM_GIT) if(BUILD_FROM_GIT)
add_custom_target(dist add_custom_target(dist
@ -337,7 +316,7 @@ endif()
# {{{ Installation # {{{ Installation
install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin) install(TARGETS ${PROJECT_AWE_NAME} ${PROJECT_AWECLIENT_NAME} RUNTIME DESTINATION bin)
install(FILES "utils/awsetbg" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(FILES "utils/awsetbg" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(FILES ${AWE_LUA_FILES} ${AWE_LUAC_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH}) install(FILES ${AWE_LUA_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH})
install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR} install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR}
RENAME ${AWE_CONF_FILE}) RENAME ${AWE_CONF_FILE})
if(GENERATE_MANPAGES) if(GENERATE_MANPAGES)

3
awesomeConfig.cmake
View File

@ -49,9 +49,6 @@ a_find_program(GREP_EXECUTABLE grep TRUE)
a_find_program(GIT_EXECUTABLE git FALSE) a_find_program(GIT_EXECUTABLE git FALSE)
a_find_program(HOSTNAME_EXECUTABLE hostname FALSE) a_find_program(HOSTNAME_EXECUTABLE hostname FALSE)
a_find_program(GPERF_EXECUTABLE gperf TRUE) a_find_program(GPERF_EXECUTABLE gperf TRUE)
a_find_program(LUAC_EXECUTABLE luac5.1 FALSE)
a_find_program(LUAC_EXECUTABLE luac-5.1 FALSE)
a_find_program(LUAC_EXECUTABLE luac TRUE)
# programs needed for man pages # programs needed for man pages
a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE) a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE)
a_find_program(XMLTO_EXECUTABLE xmlto FALSE) a_find_program(XMLTO_EXECUTABLE xmlto FALSE)