diff --git a/cmake/mingw-w64/PKGBUILD b/cmake/mingw-w64/PKGBUILD index 0be59536..eef191a7 100644 --- a/cmake/mingw-w64/PKGBUILD +++ b/cmake/mingw-w64/PKGBUILD @@ -1,7 +1,7 @@ pkgname=mingw-w64-cmake pkgver=1 -pkgrel=14 +pkgrel=14.1 arch=('any') pkgdesc='CMake wrapper for MinGW (mingw-w64)' depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config') diff --git a/cmake/mingw-w64/mingw-cmake.sh b/cmake/mingw-w64/mingw-cmake.sh index 20abc991..efa06ef8 100644 --- a/cmake/mingw-w64/mingw-cmake.sh +++ b/cmake/mingw-w64/mingw-cmake.sh @@ -7,16 +7,20 @@ mingw_flags="${CUSTOM_MINGW_FLAGS:--O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -f export CFLAGS="$mingw_flags $CFLAGS" export CXXFLAGS="$mingw_flags $CXXFLAGS" -PATH=${mingw_prefix}/bin:$PATH cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${mingw_prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${mingw_prefix}/include \ - -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${mingw_prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${mingw_prefix}/etc \ - -DSHARE_INSTALL_DIR:PATH=${mingw_prefix}/share \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \ - -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \ - "$@" +additional_args=" \ + -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \ + -DCMAKE_INSTALL_LIBDIR:PATH=${mingw_prefix}/lib \ + -DINCLUDE_INSTALL_DIR:PATH=${mingw_prefix}/include \ + -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ + -DLIB_INSTALL_DIR:PATH=${mingw_prefix}/lib \ + -DSYSCONF_INSTALL_DIR:PATH=${mingw_prefix}/etc \ + -DSHARE_INSTALL_DIR:PATH=${mingw_prefix}/share \ + -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \ + -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine" + +[[ ! $PREVENT_FORCING_SHARED_LIBS ]] && + additional_args+=' -DBUILD_SHARED_LIBS:BOOL=ON' || + additional_args+=' -DBUILD_SHARED_LIBS:BOOL=OFF' + +PATH=${mingw_prefix}/bin:$PATH cmake $additional_args "$@"