From 1ba93ff80ce82e5fc4e954e99148287e8f2b3294 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sat, 25 Mar 2017 12:20:29 +0100 Subject: [PATCH] Fixed config installation with arbitrary folder name --- CMakeLists.txt | 1 + src/cmake/after_ws_install.cmake | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69ae986..083c918 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +CU_SET_PATH("CMAKE_MOD_ANTICHEAT_DIR" "${CMAKE_CURRENT_LIST_DIR}") AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/PassiveAnticheat.cpp") AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/AnticheatMgr.cpp") diff --git a/src/cmake/after_ws_install.cmake b/src/cmake/after_ws_install.cmake index 627a56e..d36d954 100644 --- a/src/cmake/after_ws_install.cmake +++ b/src/cmake/after_ws_install.cmake @@ -2,14 +2,14 @@ if( WIN32 ) if ( MSVC ) add_custom_command(TARGET worldserver POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/modules/AnticheatModule/conf/Anticheat.conf.dist" ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_ANTICHEAT_DIR}/conf/Anticheat.conf.dist" ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ ) elseif ( MINGW ) add_custom_command(TARGET worldserver POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/modules/AnticheatModule/conf/Anticheat.conf.dist" ${CMAKE_BINARY_DIR}/bin/ + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_ANTICHEAT_DIR}/conf/Anticheat.conf.dist" ${CMAKE_BINARY_DIR}/bin/ ) endif() endif() -install(FILES "${CMAKE_SOURCE_DIR}/modules/AnticheatModule/conf/Anticheat.conf.dist" DESTINATION ${CONF_DIR}) +install(FILES "${CMAKE_MOD_ANTICHEAT_DIR}/conf/Anticheat.conf.dist" DESTINATION ${CONF_DIR})