From 42b43ef3630d6609281ca99dffb1b41bc5521f83 Mon Sep 17 00:00:00 2001 From: Olion Date: Sat, 6 Jun 2015 22:26:02 +0300 Subject: [PATCH] [Build]Rename the cmake variable respecting conventions --- cmake/FindMySQL.cmake | 6 +++--- src/mangosd/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 313ee7f5..c122df09 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -117,7 +117,7 @@ if( UNIX ) endif( UNIX ) if( WIN32 ) - find_path( MYSQL_LIBRARY_PATH + find_path( MYSQL_LIBRARY_DIR NAMES libmysql.lib PATHS @@ -167,7 +167,7 @@ find_library( MYSQL_LIBRARY NAMES libmysql PATHS - "${MYSQL_LIBRARY_PATH}" + "${MYSQL_LIBRARY_DIR}" DOC "Specify the location of the mysql library here." ) endif( WIN32 ) @@ -192,7 +192,7 @@ endif( NOT WIN32 ) if( MYSQL_LIBRARY ) if( MYSQL_INCLUDE_DIR ) 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 headers: ${MYSQL_INCLUDE_DIR}") else( MYSQL_INCLUDE_DIR ) diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt index 8306a2d2..ed85e392 100644 --- a/src/mangosd/CMakeLists.txt +++ b/src/mangosd/CMakeLists.txt @@ -168,12 +168,12 @@ if(WIN32) if(MSVC) add_custom_command(TARGET ${EXECUTABLE_NAME} 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) add_custom_command(TARGET ${EXECUTABLE_NAME} 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()