summaryrefslogtreecommitdiff
path: root/src/cmake
diff options
context:
space:
mode:
authorKargatum <dowlandtop@yandex.com>2021-12-02 20:28:58 +0700
committerGitHub <noreply@github.com>2021-12-02 20:28:58 +0700
commit51adbffae43aaf56e268e1cf2d39057f5c6a17c7 (patch)
tree082eee3902a339646eaa55a603f1871cc7c4a4ec /src/cmake
parent8668a03e145d6ec43a52e5e2615a35e4db1d3943 (diff)
feat(Core/Modules): add separated lib for modules (#9281)
Diffstat (limited to 'src/cmake')
-rw-r--r--src/cmake/macros/ConfigInstall.cmake40
-rw-r--r--src/cmake/macros/ConfigureModules.cmake15
2 files changed, 4 insertions, 51 deletions
diff --git a/src/cmake/macros/ConfigInstall.cmake b/src/cmake/macros/ConfigInstall.cmake
index 7d976946ad..8dc97a8e6a 100644
--- a/src/cmake/macros/ConfigInstall.cmake
+++ b/src/cmake/macros/ConfigInstall.cmake
@@ -51,17 +51,17 @@ function(CopyModuleConfig configDir)
if(WIN32)
if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
- add_custom_command(TARGET worldserver
+ add_custom_command(TARGET modules
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/${postPath}")
- add_custom_command(TARGET worldserver
+ add_custom_command(TARGET modules
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${configDir}" "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/${postPath}")
elseif(MINGW)
- add_custom_command(TARGET worldserver
+ add_custom_command(TARGET modules
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/${postPath}")
- add_custom_command(TARGET worldserver
+ add_custom_command(TARGET modules
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${configDir} ${CMAKE_BINARY_DIR}/bin/${postPath}")
endif()
@@ -74,35 +74,3 @@ function(CopyModuleConfig configDir)
endif()
unset(postPath)
endfunction()
-
-# Stores the absolut path of the given config module in the variable
-function(GetPathToModuleConfig module variable)
- set(${variable} "${CMAKE_SOURCE_DIR}/modules/${module}/conf" PARENT_SCOPE)
-endfunction()
-
-# Creates a list of all configs modules
-# and stores it in the given variable.
-function(CollectModulesConfig)
- file(GLOB LOCALE_MODULE_LIST RELATIVE
- ${CMAKE_SOURCE_DIR}/modules
- ${CMAKE_SOURCE_DIR}/modules/*)
-
- message(STATUS "* Modules config list:")
-
- foreach(CONFIG_MODULE ${LOCALE_MODULE_LIST})
- GetPathToModuleConfig(${CONFIG_MODULE} MODULE_CONFIG_PATH)
-
- file(GLOB MODULE_CONFIG_LIST RELATIVE
- ${MODULE_CONFIG_PATH}
- ${MODULE_CONFIG_PATH}/*.conf.dist)
-
- foreach(configFileName ${MODULE_CONFIG_LIST})
- CopyModuleConfig("${MODULE_CONFIG_PATH}/${configFileName}")
- set(CONFIG_LIST ${CONFIG_LIST}${configFileName},)
- message(STATUS " |- ${configFileName}")
- endforeach()
-
- endforeach()
- message("")
- add_definitions(-DCONFIG_FILE_LIST=$<1:"${CONFIG_LIST}">)
-endfunction()
diff --git a/src/cmake/macros/ConfigureModules.cmake b/src/cmake/macros/ConfigureModules.cmake
index d57e692422..8a21fa1c80 100644
--- a/src/cmake/macros/ConfigureModules.cmake
+++ b/src/cmake/macros/ConfigureModules.cmake
@@ -71,18 +71,3 @@ function(IsDynamicLinkingModulesRequired variable)
endforeach()
set(${variable} ${IS_REQUIRED} PARENT_SCOPE)
endfunction()
-
-# Get list all modules
-function(GetModuleList)
- file(GLOB LOCALE_MODULE_LIST RELATIVE
- ${CMAKE_SOURCE_DIR}/modules
- ${CMAKE_SOURCE_DIR}/modules/*)
-
- foreach(MODULE_DIR ${LOCALE_MODULE_LIST})
- if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/modules/${MODULE_DIR}")
- set(MODULE_LIST__ ${MODULE_LIST__}${MODULE_DIR},)
- endif()
- endforeach()
-
- add_definitions(-DAC_MODULES_LIST=$<1:"${MODULE_LIST__}">)
-endfunction()