mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity

Automatically copy libmysql.dll to bin folder

Browse source
This commit is contained in:
Mordred 2019-01-03 21:32:44 +01:00
parent 47fb47112a
commit a022a37aab
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -2,7 +2,6 @@ cmake_policy( SET CMP0014 NEW )
cmake_minimum_required( VERSION 3.0.2 ) cmake_minimum_required( VERSION 3.0.2 )
project( Sapphire ) project( Sapphire )
set( CMAKE_MODULE_PATH set( CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake ) ${CMAKE_SOURCE_DIR}/cmake )

6
cmake/FindMySQL.cmake
View file

@ -189,6 +189,12 @@ if( WIN32 )
"$ENV{MYSQL_ROOT}/lib" "$ENV{MYSQL_ROOT}/lib"
DOC "Specify the location of the mysql library here." DOC "Specify the location of the mysql library here."
) )
STRING( REGEX REPLACE "(.lib)$" ".dll" MYSQL_DLL ${MYSQL_LIBRARY} )
file(COPY ${MYSQL_DLL}
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
endif( WIN32 ) endif( WIN32 )
# On Windows you typically don't need to include any extra libraries # On Windows you typically don't need to include any extra libraries

8
src/common/CMakeLists.txt
View file

@ -18,8 +18,8 @@ add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
target_link_libraries( common target_link_libraries( common
PUBLIC PUBLIC
xivdat xivdat
mysqlConnector mysqlConnector
mysql ) mysql )
if( UNIX ) if( UNIX )
target_link_libraries( common target_link_libraries( common
@ -33,7 +33,5 @@ target_include_directories( common
"${CMAKE_CURRENT_SOURCE_DIR}/" "${CMAKE_CURRENT_SOURCE_DIR}/"
"${CMAKE_CURRENT_SOURCE_DIR}/../../deps/" "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/"
"${CMAKE_CURRENT_SOURCE_DIR}/../../deps/asio/asio/include/" "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/asio/asio/include/"
"${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include/" "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include/" )
PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/")

1
src/tools/CMakeLists.txt
View file

@ -2,7 +2,6 @@ cmake_policy( SET CMP0014 NEW )
cmake_minimum_required( VERSION 3.0.2 ) cmake_minimum_required( VERSION 3.0.2 )
project( Sapphire ) project( Sapphire )
#set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin )
set( EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/tools ) set( EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/tools )
set( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/tools ) set( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/tools )