Ensure MySQL is found in vcpkg context

SOCI · May 19, 2024 · c00788e · c00788e
1 parent b9d38ba
commit c00788e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 19 deletions.
diff --git a/cmake/find_modules/FindMySQL.cmake b/cmake/find_modules/FindMySQL.cmake
@@ -15,7 +15,7 @@
 include(CheckCXXSourceCompiles)
 
 if(WIN32)
-  find_path(MySQL_INCLUDE_DIRS mysql.h
+  find_path(MySQL_INCLUDE_DIRS mysql/mysql.h
       PATHS
       $ENV{MYSQL_INCLUDE_DIR}
       $ENV{MYSQL_INCLUDE_DIRS}
@@ -26,7 +26,7 @@ if(WIN32)
       $ENV{ProgramW6432}/MySQL/*/include
    )
 else()
-  find_path(MySQL_INCLUDE_DIRS mysql.h
+  find_path(MySQL_INCLUDE_DIRS mysql/mysql.h
       PATHS
       $ENV{MYSQL_INCLUDE_DIR}
       $ENV{MYSQL_INCLUDE_DIRS}
@@ -93,7 +93,9 @@ find_package_handle_standard_args(MySQL
   REQUIRED_VARS MySQL_LIBRARIES MySQL_INCLUDE_DIRS
 )
 
-add_library(MySQL INTERFACE)
-target_link_libraries(MySQL INTERFACE ${MySQL_LIBRARIES})
-target_include_directories(MySQL INTERFACE ${MySQL_INCLUDE_DIRS})
-add_library(MySQL::MySQL ALIAS MySQL)
+if (MySQL_FOUND)
+  add_library(MySQL INTERFACE)
+  target_link_libraries(MySQL INTERFACE ${MySQL_LIBRARIES})
+  target_include_directories(MySQL INTERFACE ${MySQL_INCLUDE_DIRS})
+  add_library(MySQL::MySQL ALIAS MySQL)
+endif()
diff --git a/include/soci/mysql/soci-mysql.h b/include/soci/mysql/soci-mysql.h
@@ -35,8 +35,8 @@
     SOCI_GCC_WARNING_SUPPRESS(pedantic)
 #endif
 
-#include <mysql.h> // MySQL Client
-#include <errmsg.h> // MySQL Error codes
+#include <mysql/mysql.h> // MySQL Client
+#include <mysql/errmsg.h> // MySQL Error codes
 
 #ifdef SOCI_GCC_WARNING_RESTORE
     SOCI_GCC_WARNING_RESTORE(pedantic)

diff --git a/src/backends/mysql/CMakeLists.txt b/src/backends/mysql/CMakeLists.txt
@@ -1,17 +1,32 @@
-if (SOCI_MYSQL_AS_AVAILABLE)
-  set(REQUIRED_FLAG "")
-else()
-  set(REQUIRED_FLAG "REQUIRED")
-endif()
+option(SOCI_MYSQL_VCPKG_ONLY "Whether to look for the MySQL lib only as a vcpkg package" OFF)
 
-find_package(MySQL ${REQUIRED_FLAG})
+if (NOT SOCI_MYSQL_VCPKG_ONLY)
+  find_package(MySQL)
+endif()
 
 if (NOT MySQL_FOUND)
-  message(STATUS "Disabling MySQL backend as the required dependencies were not found")
-  set(SOCI_MYSQL OFF CACHE BOOL "" FORCE)
-  return()
+  # The MySQL package has a different name when using vcpkg
+  if (DEFINED VCPKG_TARGET_TRIPLET)
+    find_package(unofficial-libmysql)
+  endif()
+  if (unofficial-libmysql_FOUND)
+    add_library(MySQL::MySQL ALIAS unofficial::libmysql::libmysql)
+    message(STATUS "Found MySQL as a vcpkg package")
+  else()
+    if (NOT SOCI_MYSQL_AS_AVAILABLE)
+      message(FATAL_ERROR "Unable to find MySQL")
+    endif()
+    message(STATUS "Disabling MySQL backend as the required dependencies were not found")
+    set(SOCI_MYSQL OFF CACHE BOOL "" FORCE)
+    return()
+   endif()
 endif()
 
+get_target_property(UNDERLYING MySQL::MySQL ALIASED_TARGET)
+message(STATUS "Underlying: ${UNDERLYING}")
+get_target_property(INCLUDES ${UNDERLYING} INTERFACE_INCLUDE_DIRECTORIES)
+message(STATUS "Includes: ${INCLUDES}")
+
 add_library(soci_mysql
   ${SOCI_LIB_TYPE}
     "blob.cpp"

diff --git a/tests/mysql/mysql_tests.cpp b/tests/mysql/mysql_tests.cpp
@@ -23,10 +23,11 @@
 #include <ctime>
 #include <ciso646>
 #include <cstdlib>
-#include <mysqld_error.h>
-#include <errmsg.h>
 #include <cstdint>
 
+#include <mysql/mysqld_error.h>
+#include <mysql/errmsg.h>
+
 std::string connectString;
 backend_factory const &backEnd = *soci::factory_mysql();