Revert "paths paths paths"

This reverts commit 9a7d86aa6c.
This commit is contained in:
jadebenn 2024-04-06 18:47:08 -05:00
parent 9a7d86aa6c
commit dccac945bb

View File

@ -121,13 +121,12 @@ else() # Build from source
endif() endif()
set(MARIADBCPP_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/${MARIADB_SHARED_LIBRARY_NAME}") set(MARIADBCPP_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/${MARIADB_SHARED_LIBRARY_NAME}")
message(STATUS "MARIADBCPP_SHARED_LIBRARY_LOCATION = ${MARIADBCPP_SHARED_LIBRARY_LOCATION}")
if(WIN32) if(WIN32)
set(MARIADBC_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/libmariadb.lib") set(MARIADBC_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/libmariadb.lib")
endif() endif()
endif() endif()
message(STATUS "MARIADBCPP_SHARED_LIBRARY_LOCATION = ${MARIADBCPP_SHARED_LIBRARY_LOCATION}")
# Create mariadb connector library object # Create mariadb connector library object
add_library(MariaDB::ConnCpp SHARED IMPORTED GLOBAL) add_library(MariaDB::ConnCpp SHARED IMPORTED GLOBAL)
add_dependencies(MariaDB::ConnCpp mariadb_connector_cpp) add_dependencies(MariaDB::ConnCpp mariadb_connector_cpp)
@ -139,7 +138,6 @@ if(WIN32)
IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}") IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}")
elseif(APPLE) elseif(APPLE)
set_target_properties(MariaDB::ConnCpp PROPERTIES set_target_properties(MariaDB::ConnCpp PROPERTIES
IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}"
IMPORTED_SONAME "libmariadbcpp") IMPORTED_SONAME "libmariadbcpp")
endif() endif()