From 68cff957bea011ed1e1de93cfa49b97fc481b4b3 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 5 Sep 2008 20:38:25 +0200 Subject: [PATCH] build: stop compiling Lua libs Signed-off-by: Julien Danjou --- CMakeLists.txt | 23 +---------------------- awesomeConfig.cmake | 3 --- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6c1fc858..363237615 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,27 +305,6 @@ if(GENERATE_LUADOC) 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 if(BUILD_FROM_GIT) add_custom_target(dist @@ -337,7 +316,7 @@ endif() # {{{ Installation 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 ${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} RENAME ${AWE_CONF_FILE}) if(GENERATE_MANPAGES) diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index b5fdacb4f..4675064bd 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -49,9 +49,6 @@ a_find_program(GREP_EXECUTABLE grep TRUE) a_find_program(GIT_EXECUTABLE git FALSE) a_find_program(HOSTNAME_EXECUTABLE hostname FALSE) 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 a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE) a_find_program(XMLTO_EXECUTABLE xmlto FALSE)