Skip to content

Commit c11d031

Browse files
thnielsebjornmu
authored andcommitted
Bug#36805335 ODR violations around mysys and vio
Post-push fix: The shared library mysqlrouter_mysqlclient was installed in the wrong folder on windows. Change-Id: I446e73dc365d6690f84ae0205f08d4d46f7d70ce
1 parent a395dd2 commit c11d031

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

router/src/harness/src/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ LIST(REMOVE_ITEM ROUTER_MYSQLCLIENT_LINK_LIBS
189189
vio
190190
)
191191

192+
IF(WIN32)
193+
SET(ROUTER_MYSQLCLIENT_INSTALL_DIR ${ROUTER_INSTALL_BINDIR})
194+
ELSE()
195+
SET(ROUTER_MYSQLCLIENT_INSTALL_DIR ${ROUTER_INSTALL_LIBDIR})
196+
ENDIF()
197+
192198
MERGE_LIBRARIES_SHARED(router_mysqlclient
193199
# mytime
194200
clientlib
@@ -210,7 +216,7 @@ MERGE_LIBRARIES_SHARED(router_mysqlclient
210216
${ROUTER_MYSQLCLIENT_LINK_LIBS}
211217
${LIBRT}
212218

213-
DESTINATION ${ROUTER_INSTALL_LIBDIR}
219+
DESTINATION ${ROUTER_MYSQLCLIENT_INSTALL_DIR}
214220
)
215221

216222
SET(harness_source

0 commit comments

Comments
 (0)