From 4e76b78691a7dab353906f4e78ccb8598f393c4d Mon Sep 17 00:00:00 2001 From: tresf Date: Sun, 30 Apr 2017 09:17:31 -0700 Subject: [PATCH] Fix sporadic msys2 pkg-config path problems Closes #3492 --- cmake/modules/MinGWCrossCompile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/modules/MinGWCrossCompile.cmake b/cmake/modules/MinGWCrossCompile.cmake index 50ea72900..6288d435c 100644 --- a/cmake/modules/MinGWCrossCompile.cmake +++ b/cmake/modules/MinGWCrossCompile.cmake @@ -14,6 +14,10 @@ IF(LMMS_BUILD_MSYS) SET(CMAKE_C_COMPILER ${MINGW_PREFIX}/bin/gcc) SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}/bin/g++) + # Force pkg-config to look for .pc files in $MINGW_PREFIX + SET(ENV{PKG_CONFIG_PATH} ${MINGW_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}) + SET(ENV{PKG_CONFIG_PATH} ${MINGW_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}) + # For 32-bit vst support IF(WIN64) # Specify the 32-bit cross compiler @@ -85,6 +89,7 @@ IF(NOT DEFINED ENV{MINGW_DEBUG_INFO}) MESSAGE("* CMAKE_RC_COMPILER : ${CMAKE_RC_COMPILER}") MESSAGE("* WINDRES : ${WINDRES}") MESSAGE("* ENV{PKG_CONFIG} : $ENV{PKG_CONFIG}") + MESSAGE("* ENV{PKG_CONFIG_PATH} : $ENV{PKG_CONFIG_PATH}") MESSAGE("* MINGW_TOOL_PREFIX32 : ${MINGW_TOOL_PREFIX32}") MESSAGE("* CMAKE_C_COMPILER32 : ${CMAKE_C_COMPILER32}") MESSAGE("* CMAKE_CXX_COMPILER32 : ${CMAKE_CXX_COMPILER32}")