Skip to content

Commit 2066050

Browse files
committed
Too long to explain, but as the code stands right now, need to pass OpenSSL to TARGET_LINK_LIBRARIES()
1 parent 4178446 commit 2066050

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

FindMySQL.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,13 @@ ELSE (WIN32)
271271
ENDIF ()
272272
ENDIF (WIN32)
273273

274-
SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES})
275-
276274
# Optionally add more libraries from the command line
277275
# using -DEXTRA_MYSQL_DEP=...
278276
IF (EXTRA_MYSQL_DEP)
279277
LIST(APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP})
280278
ENDIF (EXTRA_MYSQL_DEP)
281279

280+
SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES})
282281

283282
SET(VERBOSE 1)
284283
IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)

driver/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ TARGET_LINK_LIBRARIES(mysqlcppconn ${MY_TARGET_LINK_LIBRARIES_DYNAMIC}
258258
${MY_GCOV_LINK_LIBRARIES}
259259
${MYSQLCPPCONN_BOOST_SYSTEM_LIBS}
260260
${MYSQLCPPCONN_BOOST_THREAD_LIBS}
261+
${MYSQLCPPCONN_EXTRA_LIBRARIES}
261262
${MYSQLCPPCONN_ICU_LIBRARY})
262263

263264
# Need to find way it's defined for mysqlcppconn-static only
@@ -269,6 +270,7 @@ TARGET_LINK_LIBRARIES(mysqlcppconn-static ${MY_TARGET_LINK_LIBRARIES_STATIC}
269270
${MY_GCOV_LINK_LIBRARIES}
270271
${MYSQLCPPCONN_BOOST_SYSTEM_LIBS}
271272
${MYSQLCPPCONN_BOOST_THREAD_LIBS}
273+
${MYSQLCPPCONN_EXTRA_LIBRARIES}
272274
${MYSQLCPPCONN_ICU_LIBRARY})
273275

274276
SET_TARGET_PROPERTIES(mysqlcppconn-static PROPERTIES

0 commit comments

Comments
 (0)