diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 5fd19dae..b7ff988f 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -139,7 +139,7 @@ endif( UNIX ) if( WIN32 ) find_library( MYSQL_LIBRARY NAMES - libmysql + mysqlclient PATHS ${MYSQL_ADD_LIBRARIES_PATH} "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib" diff --git a/deps/mysqlConnector/CMakeLists.txt b/deps/mysqlConnector/CMakeLists.txt index 1002f498..76f2f97f 100644 --- a/deps/mysqlConnector/CMakeLists.txt +++ b/deps/mysqlConnector/CMakeLists.txt @@ -16,11 +16,5 @@ set_target_properties( mysqlConnector PROPERTIES ) target_include_directories( mysqlConnector PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) -if(UNIX) - target_include_directories( mysqlConnector PUBLIC "/usr/include/mysql/" ) - -else() - target_include_directories( mysqlConnector PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../MySQL/" ) -endif() target_link_libraries( mysqlConnector PUBLIC mysql ) #cotire(mysqlConnector)