Commit c8033330 authored by Thomas Braun's avatar Thomas Braun
Browse files

Merge branch 'fix/try-run-crosscompile' into 'main' 

FindMySQL.cmake: Do not call try_run when cross-compiling

See merge request !14
parents 558fee4c 75cb581c

TangoAccessControl/cmake/FindMySQL.cmake

+6 −5
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ find_path(MySQL_INCLUDE_DIR 
unset(_mysql_inc_paths)



if (WIN32)

    set(_mysql_release_names libmysql libmariadb)

    set(_mysql_debug_names libmysqld libmariadbd)

    set(_mysql_release_names libmariadb libmysql)

    set(_mysql_debug_names libmariadbd libmysqld)

    set(_mysql_lib_paths

        "$ENV{ProgramFiles}/MySQL/*/lib"

        "$ENV{ProgramFiles\(x86\)}/MySQL/*/lib"
@@ -86,8 +86,8 @@ if (WIN32) 
        "$ENV{ProgramFiles\(x86\)}/MariaDB/lib"

        )

else()

    set(_mysql_release_names mysqlclient mysqlclient_r mariadb)

    set(_mysql_debug_names mysqlclient mysqlclient_r mariadb)

    set(_mysql_release_names mariadb mysqlclient mysqlclient_r)

    set(_mysql_debug_names mariadb mysqlclient mysqlclient_r)

endif()



find_library(MySQL_LIBRARY_RELEASE
@@ -137,7 +137,8 @@ if (MySQL_EXECUTABLE) 
    set(MySQL_exe_FOUND TRUE)

endif()



if (NOT MySQL_INCLUDE_DIR)

if (NOT MySQL_INCLUDE_DIR OR

    (CMAKE_CROSSCOMPILING AND NOT CMAKE_CROSSCOMPILING_EMULATOR))

    set(MySQL_VERSION MySQL_VERSION-NOTFOUND)

endif()