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

Fix for double mysql find

Browse source
This commit is contained in:
mordred 2019-01-04 14:29:31 +01:00
parent d5e466267e
commit 00f8fe97b0
2 changed files with 1 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -19,7 +19,7 @@ add_custom_target( copy_runtime_files ALL
# Dependencies and compiler settings # # Dependencies and compiler settings #
###################################### ######################################
include( "cmake/paths.cmake" ) include( "cmake/paths.cmake" )
include( "cmake/mysql.cmake" ) #include( "cmake/mysql.cmake" )
include( "cmake/compiler.cmake" ) include( "cmake/compiler.cmake" )
include( "cmake/cotire.cmake" ) include( "cmake/cotire.cmake" )

39
cmake/mysql.cmake
View file

@ -1,39 +0,0 @@
if(UNIX)
find_path(MYSQL_INCLUDE_DIR mysql.h
/usr/include/mysql
/usr/local/include/mysql
/opt/mysql/mysql/include
/opt/mysql/mysql/include/mysql
/opt/mysql/include
/opt/local/include/mysql5
/usr/local/mysql/include
/usr/local/mysql/include/mysql
$ENV{ProgramFiles}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include
${LIBRARY_DIR}/external/MySQL/
)
if(MYSQL_INCLUDE_DIR)
set(MYSQL_FOUND TRUE)
include_directories(${MYSQL_INCLUDE_DIR})
endif(MYSQL_INCLUDE_DIR)
if(MYSQL_FOUND)
message(STATUS "MySQL include dir: ${MYSQL_INCLUDE_DIR}")
else(MYSQL_FOUND)
message(FATAL_ERROR "Could not find MySQL headers.")
endif(MYSQL_FOUND)
else()
include_directories("${LIBRARY_DIR}/external/MySQL/")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
# 32 bit link
link_directories(${LIBRARY_DIR}/external/MySQL/x86)
link_directories(${LIBRARY_DIR}/external/zlib/x86)
else()
# 64 bit link
link_directories(${LIBRARY_DIR}/external/MySQL/x64)
link_directories(${LIBRARY_DIR}/external/zlib/x64)
endif()
endif()