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

Merge pull request #32 from Olion17/develop21

Browse Source 
[Build] Win32 cmake build process cleanup
This commit is contained in:
Foereaper 2015-06-06 21:42:10 +02:00
commit 4c067fd4ab
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/FindGit.cmake
View File

@ -35,6 +35,12 @@ endif()
find_program(GIT_EXECUTABLE find_program(GIT_EXECUTABLE
NAMES ${git_names} NAMES ${git_names}
PATHS
"$ENV{ProgramFiles}/Git/bin"
"$ENV{ProgramFiles(x86)}/Git/bin"
"$ENV{PATH}"
"/usr/bin"
"/usr/local/bin"
DOC "git command line client" DOC "git command line client"
) )
mark_as_advanced(GIT_EXECUTABLE) mark_as_advanced(GIT_EXECUTABLE)

14
cmake/FindMySQL.cmake
View File

@ -117,9 +117,9 @@ if( UNIX )
endif( UNIX ) endif( UNIX )
if( WIN32 ) if( WIN32 )
find_library( MYSQL_LIBRARY find_path( MYSQL_LIBRARY_DIR
NAMES NAMES
libmysql libmysql.lib
PATHS PATHS
${MYSQL_ADD_LIBRARIES_PATH} ${MYSQL_ADD_LIBRARIES_PATH}
"C:/Program Files/MySQL/MySQL Server 5.6/lib" "C:/Program Files/MySQL/MySQL Server 5.6/lib"
@ -161,8 +161,15 @@ if( WIN32 )
"$ENV{SystemDrive}/MySQL/*/lib/opt" "$ENV{SystemDrive}/MySQL/*/lib/opt"
"c:/msys/local/include" "c:/msys/local/include"
"$ENV{MYSQL_ROOT}/lib" "$ENV{MYSQL_ROOT}/lib"
DOC "Specify the path to the mysql library (.lib) here."
)
find_library( MYSQL_LIBRARY
NAMES
libmysql
PATHS
"${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 )
# On Windows you typically don't need to include any extra libraries # On Windows you typically don't need to include any extra libraries
@ -185,6 +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_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_INCLUDE_DIR}/../lib/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_INCLUDE_DIR}/../lib/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/" COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_DIR}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/"
) )
endif() endif()
endif() endif()