File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -271,14 +271,13 @@ ELSE (WIN32)
271
271
ENDIF ()
272
272
ENDIF (WIN32 )
273
273
274
- SET (MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES} )
275
-
276
274
# Optionally add more libraries from the command line
277
275
# using -DEXTRA_MYSQL_DEP=...
278
276
IF (EXTRA_MYSQL_DEP )
279
277
LIST (APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP} )
280
278
ENDIF (EXTRA_MYSQL_DEP )
281
279
280
+ SET (MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES} )
282
281
283
282
SET (VERBOSE 1 )
284
283
IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR )
Original file line number Diff line number Diff line change @@ -258,6 +258,7 @@ TARGET_LINK_LIBRARIES(mysqlcppconn ${MY_TARGET_LINK_LIBRARIES_DYNAMIC}
258
258
${MY_GCOV_LINK_LIBRARIES}
259
259
${MYSQLCPPCONN_BOOST_SYSTEM_LIBS}
260
260
${MYSQLCPPCONN_BOOST_THREAD_LIBS}
261
+ ${MYSQLCPPCONN_EXTRA_LIBRARIES}
261
262
${MYSQLCPPCONN_ICU_LIBRARY} )
262
263
263
264
# 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}
269
270
${MY_GCOV_LINK_LIBRARIES}
270
271
${MYSQLCPPCONN_BOOST_SYSTEM_LIBS}
271
272
${MYSQLCPPCONN_BOOST_THREAD_LIBS}
273
+ ${MYSQLCPPCONN_EXTRA_LIBRARIES}
272
274
${MYSQLCPPCONN_ICU_LIBRARY} )
273
275
274
276
SET_TARGET_PROPERTIES (mysqlcppconn-static PROPERTIES
You can’t perform that action at this time.
0 commit comments