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

[Build]Rename the cmake variable respecting conventions

Browse Source
This commit is contained in:
Olion 2015-06-06 22:26:02 +03:00
parent 5e9bee65d5
commit 42b43ef363
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/FindMySQL.cmake
View File

@ -117,7 +117,7 @@ if( UNIX )
endif( UNIX ) endif( UNIX )
if( WIN32 ) if( WIN32 )
find_path( MYSQL_LIBRARY_PATH find_path( MYSQL_LIBRARY_DIR
NAMES NAMES
libmysql.lib libmysql.lib
PATHS PATHS
@ -167,7 +167,7 @@ find_library( MYSQL_LIBRARY
NAMES NAMES
libmysql libmysql
PATHS PATHS
"${MYSQL_LIBRARY_PATH}" "${MYSQL_LIBRARY_DIR}"
DOC "Specify the location of the mysql library here." DOC "Specify the location of the mysql library here."
) )
endif( WIN32 ) endif( WIN32 )
@ -192,7 +192,7 @@ endif( NOT WIN32 )
if( MYSQL_LIBRARY ) if( MYSQL_LIBRARY )
if( MYSQL_INCLUDE_DIR ) if( MYSQL_INCLUDE_DIR )
set( MYSQL_FOUND 1 ) set( MYSQL_FOUND 1 )
message(STATUS "Found MySQL library path: ${MYSQL_LIBRARY_PATH}") message(STATUS "Found MySQL library path: ${MYSQL_LIBRARY_DIR}")
message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}") message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}") message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
else( MYSQL_INCLUDE_DIR ) else( MYSQL_INCLUDE_DIR )

4
src/mangosd/CMakeLists.txt
View File

@ -168,12 +168,12 @@ if(WIN32)
if(MSVC) if(MSVC)
add_custom_command(TARGET ${EXECUTABLE_NAME} add_custom_command(TARGET ${EXECUTABLE_NAME}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_PATH}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/" COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_DIR}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
) )
elseif(XCODE) elseif(XCODE)
add_custom_command(TARGET ${EXECUTABLE_NAME} add_custom_command(TARGET ${EXECUTABLE_NAME}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_PATH}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/" COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_DIR}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/"
) )
endif() endif()
endif() endif()