diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-15 16:01:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-04-13 18:22:53 +0200 |
| commit | 3a2bb2fcfdbe66028c1a30f9820775b05be36b03 (patch) | |
| tree | 919911968881fe0920e81440ce5c2ebe4bb7cef6 /src | |
| parent | 9d945f0db0265b00bc6e28bcffd4ab5440d3a99b (diff) | |
Build: Normalize executable locations in build directory for all platforms
(cherry picked from commit a7c42f1ed55e586d0d817dd99865aa7c024b0140)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 22 |
2 files changed, 16 insertions, 28 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 9a275efb840..9536ae2578a 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -64,28 +64,22 @@ set_target_properties(authserver FOLDER "server") -if(COPY_CONF AND WIN32) - if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild") - add_custom_command(TARGET authserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ - ) - elseif(MINGW) - add_custom_command(TARGET authserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_BINARY_DIR}/bin/ - ) - endif() -endif() - if(UNIX) install(TARGETS authserver DESTINATION bin) if(COPY_CONF) + add_custom_command(TARGET authserver + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../etc/authserver.conf.dist + ) install(FILES authserver.conf.dist DESTINATION ${CONF_DIR}) endif() elseif(WIN32) install(TARGETS authserver DESTINATION "${CMAKE_INSTALL_PREFIX}") if(COPY_CONF) + add_custom_command(TARGET authserver + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/authserver.conf.dist + ) install(FILES authserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() endif() diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index f723e777b4b..fec9e60fcea 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -76,28 +76,22 @@ if(WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES) add_dependencies(worldserver ${WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES}) endif() -if(COPY_CONF AND WIN32) - if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild") - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ - ) - elseif(MINGW) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/ - ) - endif() -endif() - if(UNIX) install(TARGETS worldserver DESTINATION bin) if(COPY_CONF) + add_custom_command(TARGET worldserver + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../etc/worldserver.conf.dist + ) install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR}) endif() elseif(WIN32) install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}") if(COPY_CONF) + add_custom_command(TARGET worldserver + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ + ) install(FILES worldserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() endif() |