Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-21 21:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "try manual link directory specification"

Browse Source 
This reverts commit 0c2d40632e.
This commit is contained in:
jadebenn 2024-04-06 18:47:42 -05:00
parent ce568189fc
commit 37dbb52104
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindMariaDB.cmake
View File

@ -121,7 +121,6 @@ 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()
@ -138,6 +137,7 @@ 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()

5
tests/dCommonTests/CMakeLists.txt
View File

@ -33,11 +33,6 @@ add_dependencies(dCommonTests conncpp_tests)
#set_target_properties(libmariadbcpp PROPERTIES IMPORTED_LOCATION @rpath/libmariadbcpp.dylib) #set_target_properties(libmariadbcpp PROPERTIES IMPORTED_LOCATION @rpath/libmariadbcpp.dylib)
# TEST
if(APPLE)
link_directories(${CMAKE_BINARY_DIR}/mariadbcpp)
endif()
# Link needed libraries # Link needed libraries
target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main MariaDB::ConnCpp) target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main MariaDB::ConnCpp)