mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-14 20:20:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MinGW pkg-config configuration

Browse Source
This commit is contained in:
Javier Serrano Polo
2016-05-29 03:34:29 +02:00
parent a42a3c5346
commit d599955750
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/linux.win32.script.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
export CMAKE_OPTS="-DUSE_WERROR=ON"
../cmake/build_mingw32.sh || ../cmake/build_mingw32.sh
../cmake/build_mingw32.sh

2
.travis/linux.win64.script.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
export CMAKE_OPTS="-DUSE_WERROR=ON"
../cmake/build_mingw64.sh || ../cmake/build_mingw64.sh
../cmake/build_mingw64.sh

5
cmake/modules/MinGWCrossCompile.cmake
View File

@@ -50,8 +50,7 @@ ELSE()
# Mingw tools
SET(STRIP ${MINGW_TOOL_PREFIX}strip)
SET(WINDRES ${MINGW_TOOL_PREFIX}windres)
SET(PKG_CONFIG_EXECUTABLE ${MINGW_TOOL_PREFIX}pkg-config)
SET(PKG_CONFIG_FOUND TRUE)
SET(ENV{PKG_CONFIG} ${MINGW_TOOL_PREFIX}pkg-config)
# Search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -85,7 +84,7 @@ IF(NOT DEFINED ENV{MINGW_DEBUG_INFO})
MESSAGE("* CMAKE_CXX_COMPILER : ${CMAKE_CXX_COMPILER}")
MESSAGE("* CMAKE_RC_COMPILER : ${CMAKE_RC_COMPILER}")
MESSAGE("* WINDRES : ${WINDRES}")
MESSAGE("* PKG_CONFIG_EXECUTABLE : ${PKG_CONFIG_EXECUTABLE}")
MESSAGE("* ENV{PKG_CONFIG} : $ENV{PKG_CONFIG}")
MESSAGE("* MINGW_TOOL_PREFIX32 : ${MINGW_TOOL_PREFIX32}")
MESSAGE("* CMAKE_C_COMPILER32 : ${CMAKE_C_COMPILER32}")
MESSAGE("* CMAKE_CXX_COMPILER32 : ${CMAKE_CXX_COMPILER32}")