From 077d949206e7cb191cddb070fe54a2315ff5be7a Mon Sep 17 00:00:00 2001 From: Ayase <137056643@qq.com> Date: Tue, 15 May 2018 23:11:32 +0800 Subject: [PATCH] Modify the eluna module installation method. --- CMakeLists.txt | 14 +++----------- cmake/after_load_conf.cmake | 9 +++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 cmake/after_load_conf.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 673fa30..1acb733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,6 @@ -if( ELUNA ) - CU_SET_PATH("CMAKE_MOD_ELUNA_ENGINE_DIR" "${CMAKE_CURRENT_LIST_DIR}") - add_subdirectory(lualib) - - CU_ADD_HOOK(BEFORE_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/before_gs_install.cmake") - CU_ADD_HOOK(AFTER_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/after_gs_install.cmake") - CU_ADD_HOOK(BEFORE_SCRIPTS_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/before_script_install.cmake") - CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/cmake/after_ws_install.cmake") - - install(FILES "${CMAKE_MOD_ELUNA_ENGINE_DIR}/conf/mod_LuaEngine.conf.dist" DESTINATION ${CONF_DIR}) -endif() +CU_SET_PATH("CMAKE_MOD_ELUNA_ENGINE_DIR" "${CMAKE_CURRENT_LIST_DIR}") +CU_ADD_HOOK(AFTER_LOAD_CONF "${CMAKE_CURRENT_LIST_DIR}/cmake/after_load_conf.cmake") + diff --git a/cmake/after_load_conf.cmake b/cmake/after_load_conf.cmake new file mode 100644 index 0000000..c7fcfba --- /dev/null +++ b/cmake/after_load_conf.cmake @@ -0,0 +1,9 @@ +add_subdirectory(${CMAKE_MOD_ELUNA_ENGINE_DIR}/lualib) +add_definitions(-DELUNA) +CU_ADD_HOOK(BEFORE_GAME_LIBRARY "${CMAKE_MOD_ELUNA_ENGINE_DIR}/cmake/before_gs_install.cmake") +CU_ADD_HOOK(AFTER_GAME_LIBRARY "${CMAKE_MOD_ELUNA_ENGINE_DIR}/cmake/after_gs_install.cmake") +CU_ADD_HOOK(BEFORE_SCRIPTS_LIBRARY "${CMAKE_MOD_ELUNA_ENGINE_DIR}/cmake/before_script_install.cmake") +CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_MOD_ELUNA_ENGINE_DIR}/cmake/after_ws_install.cmake") + +message("[Eluna Module] LuaEngine is enable!") +