From a4d55c4b8f6647009319e75cd7c15934a10cba77 Mon Sep 17 00:00:00 2001 From: xl000 Date: Tue, 23 Aug 2022 18:16:53 +0800 Subject: [PATCH] Fix Windows static build --- cmake/libutils.cmake | 2 +- install_layout.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 05ea32e98..b1f3110f9 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -314,7 +314,7 @@ function(merge_libraries TARGET) --target ${TARGET}-deps --config $ -- - /nologo /v:q /filelogger /flp:Verbosity=q /flp:ShowCommandLine + /nologo /v:q /filelogger /flp:Verbosity=m /flp:ShowCommandLine /flp:LogFile=\"${log_file}.STATIC\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/install_layout.cmake b/install_layout.cmake index 5730ce424..e6514ace0 100644 --- a/install_layout.cmake +++ b/install_layout.cmake @@ -177,7 +177,7 @@ set(LIB_NAME_BASE "mysqlcppconn${CONCPP_VERSION_MAJOR}") set(LIB_NAME_STATIC "${LIB_NAME_BASE}-static") if(WIN32 AND STATIC_MSVCRT) - set(LIB_NAME_STATIC "${LIB_NAME}-mt") + set(LIB_NAME_STATIC "${LIB_NAME_STATIC}-mt") endif() if(BUILD_STATIC)