edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9232 from BlaiZephyr/supersede_mysql

Browse source 
Remove ENV-vars from FindMySQL.cmake
This commit is contained in:
heinrich5991 2024-11-11 13:03:52 +00:00 committed by GitHub
parent 0ebfa4802d 59e50f0d90
commit 1ff5d5b10f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/FindMySQL.cmake
View file

@ -36,21 +36,12 @@ if(NOT CMAKE_CROSSCOMPILING)
endif() endif()
endif() endif()
if(DEFINED ENV{MYSQL_LIBRARY_PATH}) set_extra_dirs_lib(MYSQL mysql)
list(APPEND MYSQL_CONFIG_LIBRARY_PATH $ENV{MYSQL_LIBRARY_PATH})
endif()
if(DEFINED ENV{MYSQL_INCLUDE_PATH})
set(MYSQL_CONFIG_INCLUDE_DIR $ENV{MYSQL_INCLUDE_PATH})
endif()
find_library(MYSQL_LIBRARY find_library(MYSQL_LIBRARY
NAMES "mysqlclient" "mysqlclient_r" "mariadbclient" NAMES "mysqlclient" "mysqlclient_r" "mariadbclient"
#explicitly tell CMake to search through the nix/store when using nix/NixOS
HINTS HINTS
${MYSQL_CONFIG_LIBRARY_PATH}
$ENV{MYSQL_LIBRARY_PATH}
${CMAKE_CURRENT_LIST_DIR}/../mysql
/run/current-system/sw/lib
${NIX_STORE_DIR} ${NIX_STORE_DIR}
PATHS PATHS
/nix/store /nix/store
@ -59,14 +50,9 @@ find_library(MYSQL_LIBRARY
mariadb mariadb
${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH} ${CROSSCOMPILING_NO_CMAKE_SYSTEM_PATH}
) )
find_path(MYSQL_INCLUDEDIR find_path(MYSQL_INCLUDEDIR
NAMES "mysql.h" NAMES "mysql.h"
HINTS HINTS
${MYSQL_CONFIG_INCLUDE_DIR}
$ENV{MYSQL_INCLUDE_PATH}
${CMAKE_CURRENT_LIST_DIR}/../mysql
/run/current-system/sw/include
${NIX_STORE_DIR} ${NIX_STORE_DIR}
PATHS PATHS
/nix/store /nix/store