server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make AppVeyor happy

Browse Source
This commit is contained in:
H0zen 2018-03-28 23:45:03 +03:00
parent f49b02611e
commit f40ac40f02
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindMySQL.cmake
View File

@ -38,7 +38,7 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
)
find_library(MYSQL_LIBRARY
NAMES
libmysql
libmysql libmariadb
PATHS
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.0/lib/opt"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.1/lib/opt"

3
cmake/SetDefinitions.cmake
View File

@ -43,6 +43,7 @@ if(WIN32)
set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/)
if(MSVC)
set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
if(PLATFORM EQUAL 64)
# This definition is necessary to work around a bug with Intellisense described
# here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper
@ -149,4 +150,4 @@ elseif(UNIX)
# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wno-ignored-attributes -Wno-deprecated-declarations")
endif()
endif()
endif()

6
src/CMakeLists.txt
View File

@ -55,7 +55,9 @@ endif()
if (BUILD_MANGOSD OR BUILD_REALMD)
if(WIN32)
get_filename_component(MYSQL_LIB_DIR ${MYSQL_LIBRARY} DIRECTORY)
install(FILES ${MYSQL_LIB_DIR}/libmysql.dll DESTINATION ${BIN_DIR})
get_filename_component(MYSQL_LIB_DLL ${MYSQL_LIBRARY} NAME)
STRING(REPLACE ".lib" ".dll" MYSQL_LIB_DLL ${MYSQL_LIB_DLL})
install(FILES ${MYSQL_LIB_DIR}/${MYSQL_LIB_DLL} DESTINATION ${BIN_DIR})
install(FILES ${OPENSSL_ROOT_DIR}/libeay32.dll DESTINATION ${BIN_DIR})
endif()
endif()
endif()

6
src/game/CMakeLists.txt
View File

@ -189,9 +189,3 @@ endif()
#AH Bot Config
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot/ahbot.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist" DESTINATION "${CONF_INSTALL_DIR}")
if(WIN32 AND MSVC)
add_custom_command(TARGET ${LIBRARY_NAME}
POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist" "${CONF_COPY_DIR}"
)
endif()