Skip to content

Commit

Permalink
Fix sporadic msys2 pkg-config path problems
Browse files Browse the repository at this point in the history
Closes LMMS#3492
  • Loading branch information
tresf committed Apr 30, 2017
1 parent a32d36f commit 2feb082
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions cmake/modules/MinGWCrossCompile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}")
Expand Down

0 comments on commit 2feb082

Please sign in to comment.