From 1b5af3bc4c70777b13fcac7f3cbbe3fdadf08a65 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Mon, 18 Jan 2016 22:05:56 +0100 Subject: [PATCH] [cmake] Fixed wrong library path for MinGW/MSYS Makefiles generator --- .cmake/Modules/Subprojects.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.cmake/Modules/Subprojects.cmake b/.cmake/Modules/Subprojects.cmake index 39c2b01..7e79603 100644 --- a/.cmake/Modules/Subprojects.cmake +++ b/.cmake/Modules/Subprojects.cmake @@ -78,7 +78,11 @@ function (cr_add_subproject _NAME) if (WIN32) set ("${_NAME}_SHARED_LIB" "${install_prefix}/lib/${_NAME}.dll" PARENT_SCOPE) - set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/${_NAME}.lib" PARENT_SCOPE) + if (ARGS_GENERATOR MATCHES "(MSYS|MinGW) Makefiles") + set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/lib${_NAME}.a" PARENT_SCOPE) + else () + set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/${_NAME}.lib" PARENT_SCOPE) + endif () elseif (APPLE) set ("${_NAME}_SHARED_LIB" "${install_prefix}/lib/lib${_NAME}.dylib" PARENT_SCOPE) set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/lib${_NAME}.a" PARENT_SCOPE)